diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:41:28 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:41:28 +0300 |
| commit | b465dc202f0ba6e5ce465c5dabca2b2a3560cad6 (patch) | |
| tree | abc9a5465a2c880cd4c37144b948d098c7bc3573 /pkgs/tools/filesystems | |
| parent | 4ff8f377afcfcb206c585f165dc1332c9fb1eba1 (diff) | |
| download | nixlib-b465dc202f0ba6e5ce465c5dabca2b2a3560cad6.tar nixlib-b465dc202f0ba6e5ce465c5dabca2b2a3560cad6.tar.gz nixlib-b465dc202f0ba6e5ce465c5dabca2b2a3560cad6.tar.bz2 nixlib-b465dc202f0ba6e5ce465c5dabca2b2a3560cad6.tar.lz nixlib-b465dc202f0ba6e5ce465c5dabca2b2a3560cad6.tar.xz nixlib-b465dc202f0ba6e5ce465c5dabca2b2a3560cad6.tar.zst nixlib-b465dc202f0ba6e5ce465c5dabca2b2a3560cad6.zip | |
boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which automates parts of this, in particular the output propagation.
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/xtreemfs/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 19457e136556..ad237e408c66 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -267,7 +267,7 @@ stdenv.mkDerivation { # Fix .la file link dependencies find "$lib/lib" -name \*.la | xargs sed -i \ - -e 's,-lboost_[a-z]*,-L${boost.lib}/lib \0,g' \ + -e 's,-lboost_[a-z]*,-L${boost.out}/lib \0,g' \ '' + optionalString (cryptoStr == "cryptopp") '' -e 's,-lcryptopp,-L${optCryptopp}/lib \0,g' \ '' + optionalString (cryptoStr == "nss") '' diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 556cb674212d..bbd4b185d5ec 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { export ANT_HOME=${ant} export BOOST_INCLUDEDIR=${boost.dev}/include - export BOOST_LIBRARYDIR=${boost.lib}/lib + export BOOST_LIBRARYDIR=${boost.out}/lib export OPENSSL_ROOT_DIR=${openssl} substituteInPlace cpp/cmake/FindValgrind.cmake \ |