From d2ef0577c5783333d3832bfb312516173b06fb8d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Aug 2016 18:52:17 +0300 Subject: [PATCH] grail: Fix 'lib.optional' use Produces a list-of-lists as buildInputs. --- pkgs/development/libraries/grail/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index a4f27824d13..3464e229495 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -4,13 +4,14 @@ stdenv.mkDerivation rec { name = "grail-${version}"; version = "3.1.0"; + src = fetchurl { url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2"; sha256 = "c26dced1b3f4317ecf6af36db0e90294d87e43966d56aecc4e97b65368ab78b9"; }; buildInputs = [ pkgconfig python3 frame ] - ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; + ++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; @@ -20,4 +21,4 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +}