diff options
| author | John Ericson <git@JohnEricson.me> | 2019-10-26 09:39:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 09:39:32 +0200 |
| commit | 6a4726d602e645b99d1af155907ae487d50b6df7 (patch) | |
| tree | 5fee141e3b201b0404d7e5fb51139b9d1e379241 /pkgs/development/libraries/openssl | |
| parent | 614cf5d00aa87587a9869bfeb0b78ad3f07563b2 (diff) | |
| parent | 2df354fd1e22ae46a0c412e221167c9ca5085bdd (diff) | |
| download | nixlib-6a4726d602e645b99d1af155907ae487d50b6df7.tar nixlib-6a4726d602e645b99d1af155907ae487d50b6df7.tar.gz nixlib-6a4726d602e645b99d1af155907ae487d50b6df7.tar.bz2 nixlib-6a4726d602e645b99d1af155907ae487d50b6df7.tar.lz nixlib-6a4726d602e645b99d1af155907ae487d50b6df7.tar.xz nixlib-6a4726d602e645b99d1af155907ae487d50b6df7.tar.zst nixlib-6a4726d602e645b99d1af155907ae487d50b6df7.zip | |
Merge pull request #68398 from angerman/feature/fix-openssl
fix openssl for cross compilation
Diffstat (limited to 'pkgs/development/libraries/openssl')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 3ff156b9d2b1..3a5a37cc4779 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -96,7 +96,11 @@ let '' + '' mkdir -p $bin + '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) + '' substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl} + '' + + '' mv $out/bin $bin/ mkdir $dev @@ -108,7 +112,7 @@ let rmdir $out/etc/ssl/{certs,private} ''; - postFixup = '' + postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) '' # Check to make sure the main output doesn't depend on perl if grep -r '${buildPackages.perl}' $out; then echo "Found an erroneous dependency on perl ^^^" >&2 |