Skip to content

Commit

Permalink
quictls: remove run-time dependency of perl due to c_rehash
Browse files Browse the repository at this point in the history
same as changes applied to openssl
  • Loading branch information
adrian-gierakowski authored and Artturin committed Apr 14, 2023
1 parent 18f1be7 commit 7b45dfa
Showing 1 changed file with 12 additions and 23 deletions.
35 changes: 12 additions & 23 deletions pkgs/development/libraries/quictls/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
{ lib, stdenv, fetchurl, buildPackages, perl, coreutils, fetchFromGitHub
, makeWrapper
, withCryptodev ? false, cryptodev
, enableSSL2 ? false
, enableSSL3 ? false
, static ? stdenv.hostPlatform.isStatic
# Used to avoid cross compiling perl, for example, in darwin bootstrap tools.
# This will cause c_rehash to refer to perl via the environment, but otherwise
# will produce a perfectly functional openssl binary and library.
, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform
, removeReferencesTo
}:

Expand Down Expand Up @@ -52,11 +49,8 @@ stdenv.mkDerivation rec {
!(stdenv.hostPlatform.useLLVM or false) &&
stdenv.cc.isGNU;

nativeBuildInputs = [ perl removeReferencesTo ];
buildInputs = lib.optional withCryptodev cryptodev
# perl is included to allow the interpreter path fixup hook to set the
# correct interpreter in c_rehash.
++ lib.optional withPerl perl;
nativeBuildInputs = [ makeWrapper perl removeReferencesTo ];
buildInputs = lib.optional withCryptodev cryptodev;

# TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = [];
Expand Down Expand Up @@ -140,22 +134,17 @@ stdenv.mkDerivation rec {
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
rm "$out/lib/"*.a
fi
'') + lib.optionalString (!stdenv.hostPlatform.isWindows)
# Fix bin/c_rehash's perl interpreter line
#
# - openssl 1_0_2: embeds a reference to buildPackages.perl
# - openssl 1_1: emits "#!/usr/bin/env perl"
#
# In the case of openssl_1_0_2, reset the invalid reference and let the
# interpreter hook take care of it.
#
# In both cases, if withPerl = false, the intepreter line is expected be
# "#!/usr/bin/env perl"
''
substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl}/bin/perl "/usr/bin/env perl"
'' + ''
'') + ''
mkdir -p $bin
mv $out/bin $bin/bin
# c_rehash is a legacy perl script with the same functionality
# as `openssl rehash`
# this wrapper script is created to maintain backwards compatibility without
# depending on perl
makeWrapper $bin/bin/openssl $bin/bin/c_rehash \
--add-flags "rehash"
mkdir $dev
mv $out/include $dev/
# remove dependency on Perl at runtime
Expand Down

0 comments on commit 7b45dfa

Please sign in to comment.