nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Mass replace 'bzip2}/lib' to refer the 'out' output

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-01-24 09:29:00 +02:00
parent d005808127
commit 51bf60b33e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/sublime3/default.nix
View File

@ -57,7 +57,7 @@ in let
--set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}
# Without this, plugin_host crashes, even though it has the rpath # 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 { in stdenv.mkDerivation {

2
pkgs/development/libraries/tokyo-cabinet/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
postInstall = postInstall =
'' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \ '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \
-e 's|-lz|-L${zlib}/lib -lz|g; -e 's|-lz|-L${zlib}/lib -lz|g;
s|-lbz2|-L${bzip2}/lib -lbz2|g' s|-lbz2|-L${bzip2.out}/lib -lbz2|g'
''; '';
meta = { meta = {

2
pkgs/top-level/perl-packages.nix
View File

@ -1940,7 +1940,7 @@ let self = _self // overrides; _self = with self; {
# Don't build a private copy of bzip2. # Don't build a private copy of bzip2.
BUILD_BZIP2 = false; BUILD_BZIP2 = false;
BZIP2_LIB = "${pkgs.bzip2}/lib"; BZIP2_LIB = "${pkgs.bzip2.out}/lib";
BZIP2_INCLUDE = "${pkgs.bzip2}/include"; BZIP2_INCLUDE = "${pkgs.bzip2}/include";
meta = { meta = {