From f1bd1b9fdd074a32b1a83d70acb4992b32cb686c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 11:17:59 +0100 Subject: [PATCH] emacsPackages.forge: Fix build --- .../editors/emacs-modes/melpa-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 45348e954c8..ed1550de768 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -128,6 +128,12 @@ instantenous and formats commits for you. inherit (self.melpaPackages) ess ctable popup; }; + forge = super.forge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + flycheck-rtags = fix-rtags super.flycheck-rtags; gnuplot = super.gnuplot.overrideAttrs (old: { @@ -449,12 +455,6 @@ instantenous and formats commits for you. (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - forge = super.forge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - gerrit = super.gerrit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ];