From 8b49936ad4db7499050aa6f57ce89d606c7382fe Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 8 Jun 2017 20:53:20 +0200 Subject: vboot_reference: fix evaluation after 1aac1fe5dd --- pkgs/tools/system/vboot_reference/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 3d4f99fc1f0b..a9a034ebde91 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -12,11 +12,10 @@ stdenv.mkDerivation rec { sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; }; - buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ] ++ - (if libuuid == null - then [] - else [ (stdenv.lib.overrideDerivation libuuid - (args: { configureFlags = args.configureFlags + " --enable-static"; })) ]); + buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ] + ++ stdenv.lib.optional (libuuid != null) + (libuuid.overrideAttrs (attrs: + { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; })); arch = if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "i686-linux" then "x86" -- cgit 1.4.1