diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:29:00 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:33 +0200 |
| commit | 51bf60b33e0c85e1d3beb5d7a12efe702efae864 (patch) | |
| tree | b6a298b8253de3a456caa2fbe457190b8c7cf507 /pkgs | |
| parent | d0058081272f58025693581e751facc388b46c86 (diff) | |
| download | nixpkgs-51bf60b33e0c85e1d3beb5d7a12efe702efae864.tar nixpkgs-51bf60b33e0c85e1d3beb5d7a12efe702efae864.tar.gz nixpkgs-51bf60b33e0c85e1d3beb5d7a12efe702efae864.tar.bz2 nixpkgs-51bf60b33e0c85e1d3beb5d7a12efe702efae864.tar.lz nixpkgs-51bf60b33e0c85e1d3beb5d7a12efe702efae864.tar.xz nixpkgs-51bf60b33e0c85e1d3beb5d7a12efe702efae864.tar.zst nixpkgs-51bf60b33e0c85e1d3beb5d7a12efe702efae864.zip | |
treewide: Mass replace 'bzip2}/lib' to refer the 'out' output
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/sublime3/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/tokyo-cabinet/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 49c30a1f6d6..c6cc813d6b1 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -57,7 +57,7 @@ in let --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 0b210a589d4..7512e085449 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postInstall = '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \ -e 's|-lz|-L${zlib}/lib -lz|g; - s|-lbz2|-L${bzip2}/lib -lbz2|g' + s|-lbz2|-L${bzip2.out}/lib -lbz2|g' ''; meta = { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de1fcc4e27e..516b42a0274 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1940,7 +1940,7 @@ let self = _self // overrides; _self = with self; { # Don't build a private copy of bzip2. BUILD_BZIP2 = false; - BZIP2_LIB = "${pkgs.bzip2}/lib"; + BZIP2_LIB = "${pkgs.bzip2.out}/lib"; BZIP2_INCLUDE = "${pkgs.bzip2}/include"; meta = { |