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

Merge pull request #68398 from angerman/feature/fix-openssl

Browse Source 
fix openssl for cross compilation
This commit is contained in:
John Ericson 2019-10-26 09:39:32 +02:00 committed by GitHub
commit 6a4726d602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/openssl/default.nix
View File

@ -96,7 +96,11 @@ let
'' + '' +
'' ''
mkdir -p $bin mkdir -p $bin
'' + stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows)
''
substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl} substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl}
'' +
''
mv $out/bin $bin/ mv $out/bin $bin/
mkdir $dev mkdir $dev
@ -108,7 +112,7 @@ let
rmdir $out/etc/ssl/{certs,private} 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 # Check to make sure the main output doesn't depend on perl
if grep -r '${buildPackages.perl}' $out; then if grep -r '${buildPackages.perl}' $out; then
echo "Found an erroneous dependency on perl ^^^" >&2 echo "Found an erroneous dependency on perl ^^^" >&2