perl: fix build with libxcrypt
This commit is contained in:
parent
e36bd3c473
commit
3624ac2458
3 changed files with 11 additions and 3 deletions
|
@ -1,10 +1,12 @@
|
|||
{ config, lib, stdenv, fetchurl, fetchFromGitHub, pkgs, buildPackages
|
||||
, callPackage
|
||||
, enableThreading ? true, coreutils, makeWrapper
|
||||
, enableCrypt ? true
|
||||
, enableCrypt ? true, libxcrypt ? null
|
||||
, zlib
|
||||
}:
|
||||
|
||||
assert (enableCrypt -> (libxcrypt != null));
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
# cannot use fetchpatch! All mutable patches (generated by GitHub or
|
||||
# cgit) that are needed here should be included directly in Nixpkgs as
|
||||
|
@ -34,6 +36,8 @@ let
|
|||
optional crossCompiling "mini";
|
||||
setOutputFlags = false;
|
||||
|
||||
propagatedBuildInputs = lib.optional enableCrypt libxcrypt;
|
||||
|
||||
disallowedReferences = [ stdenv.cc ];
|
||||
|
||||
patches =
|
||||
|
|
|
@ -221,7 +221,7 @@ in
|
|||
# This is not an issue for the final stdenv, because this perl
|
||||
# won't be included in the final stdenv and won't be exported to
|
||||
# top-level pkgs as an override either.
|
||||
perl = super.perl.override { enableThreading = false; };
|
||||
perl = super.perl.override { enableThreading = false; enableCrypt = false; };
|
||||
};
|
||||
})
|
||||
|
||||
|
|
|
@ -20710,7 +20710,11 @@ with pkgs;
|
|||
libx86 = callPackage ../development/libraries/libx86 {};
|
||||
|
||||
libxcrypt = callPackage ../development/libraries/libxcrypt {
|
||||
perl = perl.override { enableCrypt = false; };
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
perl = perl.override {
|
||||
enableCrypt = false;
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
};
|
||||
};
|
||||
|
||||
libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };
|
||||
|
|
Loading…
Reference in a new issue