perl: fix build with libxcrypt

authored by

Franz Pletz and committed by
Martin Weinelt
3624ac24 e36bd3c4

+11 -3
+5 -1
pkgs/development/interpreters/perl/default.nix
··· 1 1 { config, lib, stdenv, fetchurl, fetchFromGitHub, pkgs, buildPackages 2 2 , callPackage 3 3 , enableThreading ? true, coreutils, makeWrapper 4 - , enableCrypt ? true 4 + , enableCrypt ? true, libxcrypt ? null 5 5 , zlib 6 6 }: 7 + 8 + assert (enableCrypt -> (libxcrypt != null)); 7 9 8 10 # Note: this package is used for bootstrapping fetchurl, and thus 9 11 # cannot use fetchpatch! All mutable patches (generated by GitHub or ··· 33 35 outputs = [ "out" "man" "devdoc" ] ++ 34 36 optional crossCompiling "mini"; 35 37 setOutputFlags = false; 38 + 39 + propagatedBuildInputs = lib.optional enableCrypt libxcrypt; 36 40 37 41 disallowedReferences = [ stdenv.cc ]; 38 42
+1 -1
pkgs/stdenv/linux/default.nix
··· 221 221 # This is not an issue for the final stdenv, because this perl 222 222 # won't be included in the final stdenv and won't be exported to 223 223 # top-level pkgs as an override either. 224 - perl = super.perl.override { enableThreading = false; }; 224 + perl = super.perl.override { enableThreading = false; enableCrypt = false; }; 225 225 }; 226 226 }) 227 227
+5 -1
pkgs/top-level/all-packages.nix
··· 20710 20710 libx86 = callPackage ../development/libraries/libx86 {}; 20711 20711 20712 20712 libxcrypt = callPackage ../development/libraries/libxcrypt { 20713 - perl = perl.override { enableCrypt = false; }; 20713 + fetchurl = stdenv.fetchurlBoot; 20714 + perl = perl.override { 20715 + enableCrypt = false; 20716 + fetchurl = stdenv.fetchurlBoot; 20717 + }; 20714 20718 }; 20715 20719 20716 20720 libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };