From 25ee2516c2f8368eb348630ab3004bb72e2c73f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Feb 2018 16:53:07 +0100 Subject: [PATCH] haskell-generic-builder: simplify outputs attribute logic The arguments cannot contain outputs, so the if-then-else here is pointless. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 14a8a628b58..71b2d1288a0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -191,7 +191,7 @@ assert allPkgconfigDepends != [] -> pkgconfig != null; stdenv.mkDerivation ({ name = "${pname}-${version}"; - outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc")); + outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"); setOutputFlags = false; pos = builtins.unsafeGetAttrPos "pname" args;