gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacs: handle propagatedBuildInputs correctly for genericBuild

Browse Source 
Without this patch, if there is propagatedBuildInputs in the arguments
of genericBuild, it will override the value set by genericBuild.  With
this patch applied, the argument and the value set by genericBuild are
merged instead.
This commit is contained in:
Lin Jian
2024-08-05 07:59:39 +08:00
parent 675dcef30a
commit cdf4aef5e2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/emacs/build-support/generic.nix
+3 -2
View File
@@ -4,7 +4,7 @@
let
inherit (lib) optionalAttrs;
handledArgs = [ "buildInputs" "nativeBuildInputs" "packageRequires" "propagatedUserEnvPkgs" "meta" ]
handledArgs = [ "buildInputs" "nativeBuildInputs" "packageRequires" "propagatedBuildInputs" "propagatedUserEnvPkgs" "meta" ]
++ lib.optionals (emacs.withNativeCompilation or false) [ "postInstall" ];
setupHook = writeText "setup-hook.sh" ''
@@ -28,6 +28,7 @@ in
, buildInputs ? []
, nativeBuildInputs ? []
, packageRequires ? []
, propagatedBuildInputs ? []
, propagatedUserEnvPkgs ? []
, postInstall ? ""
, meta ? {}
@@ -57,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: ({
buildInputs = packageRequires ++ buildInputs;
nativeBuildInputs = [ emacs texinfo ] ++ nativeBuildInputs;
propagatedBuildInputs = packageRequires;
propagatedBuildInputs = packageRequires ++ propagatedBuildInputs;
propagatedUserEnvPkgs = packageRequires ++ propagatedUserEnvPkgs;
inherit setupHook;