ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

grail: Fix 'lib.optional' use

Browse Source 
Produces a list-of-lists as buildInputs.
This commit is contained in:
Tuomas Tynkkynen 2016-08-30 18:52:17 +03:00
parent 3a762ef967
commit d2ef0577c5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/grail/default.nix
View File

@ -4,13 +4,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "grail-${version}"; name = "grail-${version}";
version = "3.1.0"; version = "3.1.0";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2"; url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2";
sha256 = "c26dced1b3f4317ecf6af36db0e90294d87e43966d56aecc4e97b65368ab78b9"; sha256 = "c26dced1b3f4317ecf6af36db0e90294d87e43966d56aecc4e97b65368ab78b9";
}; };
buildInputs = [ pkgconfig python3 frame ] 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"; configureFlags = stdenv.lib.optional enableX11 "--with-x11";
@ -20,4 +21,4 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
} }