colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-01-24 09:30:05 +02:00
parent 2258aecaa5
commit d91c7347d1
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/system/boot/luksroot.nix
View File

@ -438,7 +438,7 @@ in
copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo
copy_bin_and_libs ${pkgs.openssl}/bin/openssl copy_bin_and_libs ${pkgs.openssl}/bin/openssl
cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
strip -s pbkdf2-sha512 strip -s pbkdf2-sha512
copy_bin_and_libs pbkdf2-sha512 copy_bin_and_libs pbkdf2-sha512

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.out}/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.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
''; '';
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {

2
pkgs/applications/networking/ike/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
make install make install
for file in "$out"/bin/* "$out"/sbin/*; do for file in "$out"/bin/* "$out"/sbin/*; do
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib" wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl.out}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib"
done done
''; '';

4
pkgs/applications/networking/instant-messengers/fuze/default.nix
View File

@ -39,8 +39,8 @@ stdenv.mkDerivation {
$f $f
done done
ln -s ${openssl}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8 ln -s ${openssl.out}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8
ln -s ${openssl}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8 ln -s ${openssl.out}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8
ln -s $out/lib/fuzebox/FuzeLinuxApp $out/bin/fuze ln -s $out/lib/fuzebox/FuzeLinuxApp $out/bin/fuze
''; '';

2
pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
substituteInPlace $out/bin/pybitmessage \ substituteInPlace $out/bin/pybitmessage \
--replace "exec python2" "exec ${python}/bin/python" \ --replace "exec python2" "exec ${python}/bin/python" \
--replace "/opt/openssl-compat-bitcoin/lib/" "${openssl}/lib/" --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/"
wrapProgram $out/bin/pybitmessage \ wrapProgram $out/bin/pybitmessage \
--prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
''; '';

4
pkgs/development/compilers/ponyc/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation {
''; '';
preCheck = '' preCheck = ''
export LIBRARY_PATH="$out/lib:${openssl}/lib:${pcre2}/lib" export LIBRARY_PATH="$out/lib:${openssl.out}/lib:${pcre2}/lib"
''; '';
installPhase = '' installPhase = ''
@ -34,7 +34,7 @@ stdenv.mkDerivation {
mv $out/bin/ponyc $out/bin/ponyc.wrapped mv $out/bin/ponyc $out/bin/ponyc.wrapped
makeWrapper $out/bin/ponyc.wrapped $out/bin/ponyc \ makeWrapper $out/bin/ponyc.wrapped $out/bin/ponyc \
--prefix LIBRARY_PATH : "$out/lib" \ --prefix LIBRARY_PATH : "$out/lib" \
--prefix LIBRARY_PATH : "${openssl}/lib" \ --prefix LIBRARY_PATH : "${openssl.out}/lib" \
--prefix LIBRARY_PATH : "${pcre2}/lib" --prefix LIBRARY_PATH : "${pcre2}/lib"
''; '';

2
pkgs/servers/nosql/arangodb/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
openssl zlib python gyp go readline openssl zlib python gyp go readline
]; ];
configureFlagsArray = [ "--with-openssl-lib=${openssl}/lib" ]; configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ];
patchPhase = '' patchPhase = ''
substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash

2
pkgs/servers/shellinabox/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/shellinaboxd \ wrapProgram $out/bin/shellinaboxd \
--prefix LD_LIBRARY_PATH : ${openssl}/lib --prefix LD_LIBRARY_PATH : ${openssl.out}/lib
mkdir -p $out/lib mkdir -p $out/lib
cp shellinabox/* $out/lib cp shellinabox/* $out/lib
''; '';

2
pkgs/tools/system/monit/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-ssl-incl-dir=${openssl}/include" "--with-ssl-incl-dir=${openssl}/include"
"--with-ssl-lib-dir=${openssl}/lib" "--with-ssl-lib-dir=${openssl.out}/lib"
] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ]; ] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ];
meta = { meta = {

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

@ -2491,7 +2491,7 @@ let self = _self // overrides; _self = with self; {
sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908"; sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908";
}; };
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://metacpan.org/release/Crypt-OpenSSL-AES; homepage = https://metacpan.org/release/Crypt-OpenSSL-AES;
description = "Perl wrapper around OpenSSL's AES library"; description = "Perl wrapper around OpenSSL's AES library";
@ -2508,7 +2508,7 @@ let self = _self // overrides; _self = with self; {
sha256 = "18vg2bqyhc0ahfdh5dkbgph5nh92qcz5vi99jq8aam4h86if78bk"; sha256 = "18vg2bqyhc0ahfdh5dkbgph5nh92qcz5vi99jq8aam4h86if78bk";
}; };
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
}; };
CryptOpenSSLRandom = buildPerlPackage rec { CryptOpenSSLRandom = buildPerlPackage rec {
@ -2518,7 +2518,7 @@ let self = _self // overrides; _self = with self; {
sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf"; sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf";
}; };
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
}; };
CryptOpenSSLRSA = buildPerlPackage rec { CryptOpenSSLRSA = buildPerlPackage rec {
@ -2529,7 +2529,7 @@ let self = _self // overrides; _self = with self; {
}; };
propagatedBuildInputs = [ CryptOpenSSLRandom ]; propagatedBuildInputs = [ CryptOpenSSLRandom ];
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
}; };
CryptSSLeay = buildPerlPackage rec { CryptSSLeay = buildPerlPackage rec {
@ -2538,7 +2538,7 @@ let self = _self // overrides; _self = with self; {
url = "mirror://cpan/authors/id/N/NA/NANIS/${name}.tar.gz"; url = "mirror://cpan/authors/id/N/NA/NANIS/${name}.tar.gz";
sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm";
}; };
makeMakerFlags = "--libpath=${pkgs.openssl}/lib --incpath=${pkgs.openssl}/include"; makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl}/include";
buildInputs = [ PathClass TryTiny ]; buildInputs = [ PathClass TryTiny ];
}; };