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

libxcrypt: add -legacy variant
NixOS · Mar 25, 2023 · 40aed56 · 40aed56
2 parents 049dc17 + 34ec699
commit 40aed56
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
@@ -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 = ''

diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix
@@ -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") [

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -22242,6 +22242,7 @@ with pkgs;
       fetchurl = stdenv.fetchurlBoot;
     };
   };
+  libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
 
   libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };
-Original file line number
+Diff line change
@@ Expand Up / @@ -22242,6 +22242,7 @@ with pkgs; @@
           fetchurl = stdenv.fetchurlBoot;
         };
       };
+      libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
       libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };
@@ Expand Down @@