From 37e62ac9f2e435bd3ffade4db60c7cf90780f4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20K=C3=A4mpe?= Date: Tue, 6 Jul 2021 06:04:20 +0200 Subject: [PATCH] libuldaq: init at 1.2.0 --- .../libraries/libuldaq/0001-uldaq.patch | 28 +++++++++++++++ .../libraries/libuldaq/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 64 insertions(+) create mode 100644 pkgs/development/libraries/libuldaq/0001-uldaq.patch create mode 100644 pkgs/development/libraries/libuldaq/default.nix diff --git a/pkgs/development/libraries/libuldaq/0001-uldaq.patch b/pkgs/development/libraries/libuldaq/0001-uldaq.patch new file mode 100644 index 00000000000..97375283cd6 --- /dev/null +++ b/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/pkgs/development/libraries/libuldaq/default.nix b/pkgs/development/libraries/libuldaq/default.nix new file mode 100644 index 00000000000..2f8f7fbb30e --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab5098bf2aa..dd145ff658a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17079,6 +17079,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