From 8576332fdfe5dd38da093074650cf3694acf1da3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Aug 2016 15:55:49 +0300 Subject: [PATCH] grsec: Fix build after multiple output shuffling Same problem with overrideDerivation as in https://github.com/NixOS/nixpkgs/issues/10721. Would be nice to have that fixed... --- pkgs/build-support/grsecurity/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 1070d6f746dd..19aa57ccd99a 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , overrideDerivation # required for gcc plugins @@ -24,7 +25,7 @@ overrideDerivation (kernel.override { inherit extraConfig; ignoreConfigErrors = true; }) (attrs: { - nativeBuildInputs = [ gmp libmpc mpfr ] ++ (attrs.nativeBuildInputs or []); + nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []); preConfigure = '' echo ${localver} >localversion-grsec ${attrs.preConfigure or ""}