diff --git a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix index 91a20bd3647e..e0cab0021f1f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix @@ -32,12 +32,17 @@ rec { externalSrc = pkg: epkg: - pkg.overrideAttrs (previousAttrs: { + pkg.overrideAttrs { inherit (epkg) src version; - propagatedUserEnvPkgs = previousAttrs.propagatedUserEnvPkgs or [ ] ++ [ epkg ]; - }); + }; - fix-rtags = pkg: dontConfigure (externalSrc pkg pkgs.rtags); + fix-rtags = + pkg: + dontConfigure ( + (externalSrc pkg pkgs.rtags).overrideAttrs (previousAttrs: { + propagatedUserEnvPkgs = previousAttrs.propagatedUserEnvPkgs or [ ] ++ [ pkgs.rtags ]; + }) + ); fixRequireHelmCore = pkg: diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index bb3d01ab8b5e..a51a2827c775 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -289,6 +289,9 @@ let # Build same version as Haskell package hindent = (externalSrc super.hindent pkgs.haskellPackages.hindent).overrideAttrs (attrs: { packageRequires = [ self.haskell-mode ]; + propagatedUserEnvPkgs = attrs.propagatedUserEnvPkgs or [ ] ++ [ + pkgs.haskellPackages.hindent + ]; }); hotfuzz = super.hotfuzz.overrideAttrs (old: { @@ -520,7 +523,7 @@ let ''; }); - rtags = ignoreCompilationError (dontConfigure (externalSrc super.rtags pkgs.rtags)); # elisp error + rtags = ignoreCompilationError (fix-rtags super.rtags); # elisp error rtags-xref = dontConfigure super.rtags;