diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-23 10:59:27 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-23 10:59:27 -0400 |
commit | 45f40f5fe02d71f9863e54277a50fe7e1dc46afa (patch) | |
tree | 6051fd83ecfdc83d78a39bf40c0645b55048c461 /pkgs/development/libraries | |
parent | 2091133e789b22b33cdb85af99e36c5589faf1db (diff) | |
parent | b97242238d7efb029c76eb8d4fe4b1228a5b49a8 (diff) | |
download | nixlib-45f40f5fe02d71f9863e54277a50fe7e1dc46afa.tar nixlib-45f40f5fe02d71f9863e54277a50fe7e1dc46afa.tar.gz nixlib-45f40f5fe02d71f9863e54277a50fe7e1dc46afa.tar.bz2 nixlib-45f40f5fe02d71f9863e54277a50fe7e1dc46afa.tar.lz nixlib-45f40f5fe02d71f9863e54277a50fe7e1dc46afa.tar.xz nixlib-45f40f5fe02d71f9863e54277a50fe7e1dc46afa.tar.zst nixlib-45f40f5fe02d71f9863e54277a50fe7e1dc46afa.zip |
Merge commit 'b97242238d7efb029c76eb8d4fe4b1228a5b49a8'
Both parent commits were previously tied as the most recent ancestor to 'master' and 'release-18.09'.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/libusb1/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 69afd9d4c691..7ec714f02237 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.libusb.info; description = "User-space USB library"; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index d3fb0970cd00..d348f877f722 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -3,7 +3,7 @@ , static ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "zlib-${version}"; version = "1.2.11"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # what causes this difference. + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/*.so* $out/lib/*.dylib* ; do - install_name_tool -id "$file" $file + ${stdenv.cc.bintools.targetPrefix}install_name_tool -id "$file" $file done '' # Non-typical naming confuses libtool which then refuses to use zlib's DLL @@ -78,4 +78,8 @@ stdenv.mkDerivation rec { license = licenses.zlib; platforms = platforms.all; }; -} +} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { + preConfigure = '' + export CHOST=${stdenv.hostPlatform.config} + ''; +}) |