diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-17 11:46:37 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-17 11:46:37 +0200 |
| commit | 4e6b45d0a08f9aa75b66873e51f6b8d76b6d1a1e (patch) | |
| tree | 0c6e6595050b3f2e05b49135efad03da4c1b6007 /pkgs/development/libraries/boost | |
| parent | 604b0c86bf402039f5d7e7b969153df42ee02c57 (diff) | |
| parent | af364c0f775464f902f47257e673cfebb180540e (diff) | |
| download | nixpkgs-4e6b45d0a08f9aa75b66873e51f6b8d76b6d1a1e.tar nixpkgs-4e6b45d0a08f9aa75b66873e51f6b8d76b6d1a1e.tar.gz nixpkgs-4e6b45d0a08f9aa75b66873e51f6b8d76b6d1a1e.tar.bz2 nixpkgs-4e6b45d0a08f9aa75b66873e51f6b8d76b6d1a1e.tar.lz nixpkgs-4e6b45d0a08f9aa75b66873e51f6b8d76b6d1a1e.tar.xz nixpkgs-4e6b45d0a08f9aa75b66873e51f6b8d76b6d1a1e.tar.zst nixpkgs-4e6b45d0a08f9aa75b66873e51f6b8d76b6d1a1e.zip | |
Merge branch 'master' into staging
... to get the ffmpeg changes which cause nontrivial rebuilds.
Diffstat (limited to 'pkgs/development/libraries/boost')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 335bc1b68c6..f2da2624755 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -111,7 +111,7 @@ let -exec sed '1i#line 1 "{}"' -i '{}' \; ) '' + optionalString (stdenv.cross.libc or null == "msvcrt") '' - ${stdenv.cross.config}-ranlib "$out"/lib/*.a + ${stdenv.cross.config}-ranlib "$out/lib/"*.a ''; in @@ -127,7 +127,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.boost; platforms = platforms.unix; - maintainers = with maintainers; [ simons wkennington ]; + maintainers = with maintainers; [ peti wkennington ]; }; preConfigure = '' |