diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:26:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:26:00 +0000 |
| commit | ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d (patch) | |
| tree | 504b28a058661f6c1cbb7d3f580020e50367ca7f /nixpkgs/pkgs/development/libraries/libuldaq | |
| parent | 55cc63c079f49e81d695a25bc2f5b3902f2bd290 (diff) | |
| parent | b09661d41fb93562fd53f31574dbf781b130ac44 (diff) | |
| download | nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.gz nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.bz2 nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.lz nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.xz nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.zst nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.zip | |
Merge commit 'b09661d41fb93562fd53f31574dbf781b130ac44'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libuldaq')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libuldaq/0001-uldaq.patch | 28 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libuldaq/default.nix | 34 |
2 files changed, 62 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libuldaq/0001-uldaq.patch b/nixpkgs/pkgs/development/libraries/libuldaq/0001-uldaq.patch new file mode 100644 index 000000000000..97375283cd64 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libuldaq/0001-uldaq.patch @@ -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 "" diff --git a/nixpkgs/pkgs/development/libraries/libuldaq/default.nix b/nixpkgs/pkgs/development/libraries/libuldaq/default.nix new file mode 100644 index 000000000000..2f8f7fbb30ea --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libuldaq/default.nix @@ -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 ]; + }; +} |