mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 03:30:45 +00:00
Code Issues Wiki Activity

perl: fix build with libxcrypt

Browse source
This commit is contained in:
Franz Pletz 2022-09-26 22:04:58 +02:00 committed by Martin Weinelt
parent e36bd3c473
commit 3624ac2458
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/interpreters/perl/default.nix
View file

@ -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 =

2
pkgs/stdenv/linux/default.nix
View file

@ -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; };
};
})

6
pkgs/top-level/all-packages.nix
View file

@ -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 { };