Merge pull request #238028 from amjoseph-nixpkgs/pr/glibc/info/useMakeFlags

glibcInfo: use makeFlags instead of buildPhase
This commit is contained in:
Weijia Wang
2023-06-16 11:20:05 +03:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -161,7 +161,7 @@ stdenv.mkDerivation ({
++ lib.optional withGd "--with-gd"
++ lib.optional (!withLibcrypt) "--disable-crypt";
makeFlags = [
makeFlags = (args.makeFlags or []) ++ [
"OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
];
@@ -196,7 +196,7 @@ stdenv.mkDerivation ({
passthru = { inherit version; minorRelease = version; };
}
// (removeAttrs args [ "withLinuxHeaders" "withGd" "postInstall" ]) //
// (removeAttrs args [ "withLinuxHeaders" "withGd" "postInstall" "makeFlags" ]) //
{
src = fetchurl {
+1 -1
View File
@@ -9,7 +9,7 @@ callPackage ./common.nix {} {
extraNativeBuildInputs = [ texinfo perl ];
buildPhase = "make info";
makeFlags = [ "info" ];
# I don't know why the info is not generated in 'build'
# Somehow building the info still does not work, because the final