From d3ef216c54ad47bc7c96b3d82c1308e90d5c5fc3 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Fri, 19 Jun 2015 12:56:12 -0700 Subject: darwin purity: libusb1 --- pkgs/development/libraries/libusb1/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/libusb1/default.nix') diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 884db2b3b25af..82e10eba331d2 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev ? null }: +{ stdenv, fetchurl, pkgconfig, udev ? null, libobjc, IOKit }: stdenv.mkDerivation rec { name = "libusb-1.0.19"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux udev; + propagatedBuildInputs = + stdenv.lib.optional stdenv.isLinux udev ++ + stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; -- cgit 1.4.1 From 4bc436ca3ab84867edebbdfb843c4a3f27cb199c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 25 Jun 2015 15:07:05 +0200 Subject: libusb1: fix .la file --- pkgs/development/libraries/libusb1/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/development/libraries/libusb1/default.nix') diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 884db2b3b25af..160e53714fb11 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + preFixup = '' + sed 's,-ludev,-L${udev}/lib -ludev,' -i $out/lib/libusb-1.0.la + ''; + meta = { homepage = http://www.libusb.info; description = "User-space USB library"; -- cgit 1.4.1 From 20268f6382dccc77bc9aba0e9b067c3fdf03613e Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Fri, 26 Jun 2015 09:53:28 -0700 Subject: darwin purity: libusb1 (depend on udev on linux only) --- pkgs/development/libraries/libusb1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/libusb1/default.nix') diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index b2d75e1555409..75d6bdb4cc6a8 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - preFixup = '' + preFixup = stdenv.lib.optionalString stdenv.isLinux '' sed 's,-ludev,-L${udev}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; -- cgit 1.4.1