b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #223034 from vcunat/p/libxcrypt-legacy

Browse source 
libxcrypt: add -legacy variant
This commit is contained in:
Martin Weinelt 2023-03-25 12:46:39 +01:00 committed by GitHub
parent 049dc174e4 34ec699ea0
commit 40aed56281
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
View file

@ -6,6 +6,7 @@
, perl
, unzip
, zlib
, libxcrypt-legacy
# extra params
, product
, javaVersion
@ -46,6 +47,7 @@ stdenv.mkDerivation ({
buildInputs = [
stdenv.cc.cc.lib # libstdc++.so.6
zlib
libxcrypt-legacy # libcrypt.so.1 (default is .2 now)
] ++ extraBuildInputs;
unpackPhase = ''

9
pkgs/development/libraries/libxcrypt/default.nix
View file

@ -1,4 +1,8 @@
{ lib, stdenv, fetchurl, perl, nixosTests }:
{ lib, stdenv, fetchurl, perl
# Update the enabled crypt scheme ids in passthru when the enabled hashes change
, enableHashes ? "strong"
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "libxcrypt";
@ -15,8 +19,7 @@ stdenv.mkDerivation rec {
];
configureFlags = [
# Update the enabled crypt scheme ids in passthru when the enabled hashes change
"--enable-hashes=strong"
"--enable-hashes=${enableHashes}"
"--enable-obsolete-api=glibc"
"--disable-failure-tokens"
] ++ lib.optionals (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.libc == "bionic") [

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

@ -22242,6 +22242,7 @@ with pkgs;
fetchurl = stdenv.fetchurlBoot;
};
};
libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };