diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-13 10:14:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-13 10:14:53 +0200 |
| commit | 3e387c3e005c87566b5403d24c86f71f4945a79b (patch) | |
| tree | 6ddd883a2e405850093d1f19cd18bb9b712e7c01 /pkgs/tools/filesystems | |
| parent | df8958435e1fd0c6d55394e95d3d3d2e0edca474 (diff) | |
| parent | 6c2fbfbd7720446821be2a506cefcd1e0ff3b42d (diff) | |
| download | nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.gz nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.bz2 nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.lz nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.xz nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.zst nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.zip | |
Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't build which will block nixpkgs channel. But on the whole it seems acceptable.
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 \ |