Merge pull request #129469 from simonkampe/uldaq

This commit is contained in:
Sandro 2021-07-08 16:58:50 +02:00 committed by GitHub
commit 643ce4bd0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 70 additions and 0 deletions

View file

@ -9678,6 +9678,12 @@
githubId = 11135311;
name = "Simon Chatterjee";
};
simonkampe = {
email = "simon.kampe+nix@gmail.com";
github = "simonkampe";
githubId = 254799;
name = "Simon Kämpe";
};
simonvandel = {
email = "simon.vandel@gmail.com";
github = "simonvandel";

View file

@ -0,0 +1,28 @@
diff --git a/Makefile.am b/Makefile.am
index 0e69cd4..b4a1f1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ dist_pkgconfig_DATA=libuldaq.pc
# fpga/USB_DIO32HS.bin
if OS_LINUX
-rulesdatadir=/lib/udev/rules.d/
+rulesdatadir=$(libdir)/udev/rules.d/
dist_rulesdata_DATA=rules/50-uldaq.rules
endif
@@ -42,14 +42,6 @@ dist-up: dist
mkdir -p $(reldir)
cp $(distdir).tar.bz2 $(reldir)
-if OS_LINUX
-install-data-hook:
- udevadm control --reload-rules && \
- test -f "/etc/redhat-release" && echo "/usr/local/lib" > /etc/ld.so.conf.d/uldaq.conf || echo "" && \
- test -f "/etc/arch-release" && echo "/usr/local/lib" > /etc/ld.so.conf.d/uldaq.conf || echo "" && \
- ldconfig
-endif
-
if OS_LINUX
uninstall-hook:
test -f "/etc/ld.so.conf.d/uldaq.conf" && rm "/etc/ld.so.conf.d/uldaq.conf" || echo ""

View file

@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libusb1, ...}:
stdenv.mkDerivation rec {
pname = "libuldaq";
version = "1.2.0";
src = fetchFromGitHub {
owner = "mccdaq";
repo = "uldaq";
rev = "v${version}";
sha256 = "0l9ima8ac99yd9vvjvdrmacm95ghv687wiy39zxm00cmghcfv3vj";
};
patches = [
# Patch needed for `make install` to succeed
./0001-uldaq.patch
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libusb1 ];
meta = with lib; {
description = "Library to talk to uldaq devices";
longDescription = ''
Library used to communicate with USB data acquisition (DAQ)
devices from Measurement Computing
'';
homepage = "https://github.com/mccdaq/uldaq";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.simonkampe ];
};
}

View file

@ -17085,6 +17085,8 @@ in
libutempter = callPackage ../development/libraries/libutempter { };
libuldaq = callPackage ../development/libraries/libuldaq { };
libunwind =
if stdenv.isDarwin then darwin.libunwind
else if stdenv.hostPlatform.isRiscV then llvmPackages_latest.libunwind