public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: fix nested lists in *buildInputs

Browse Source
This commit is contained in:
Robin Gloster 2019-11-09 23:14:38 +01:00 committed by Jan Tojnar
parent a012d5eebb
commit 8a227a2341
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ghc/8.6.5.nix
View File

@ -73,7 +73,7 @@ let
''; '';
# Splicer will pull out correct variations # Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
++ [libffi] ++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;

2
pkgs/development/libraries/gtk/2.x.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
./hooks/drop-icon-theme-cache.sh ./hooks/drop-icon-theme-cache.sh
]; ];
nativeBuildInputs = [ setupHooks perl pkgconfig gettext gobject-introspection ]; nativeBuildInputs = setupHooks ++ [ perl pkgconfig gettext gobject-introspection ];
patches = [ patches = [
./patches/2.0-immodules.cache.patch ./patches/2.0-immodules.cache.patch

3
pkgs/development/libraries/gtk/3.x.nix
View File

@ -115,8 +115,7 @@ stdenv.mkDerivation rec {
pkgconfig pkgconfig
python3 python3
sassc sassc
setupHooks ] ++ setupHooks ++ optionals withGtkDoc [
] ++ optionals withGtkDoc [
docbook_xml_dtd_43 docbook_xml_dtd_43
docbook_xsl docbook_xsl
gtk-doc gtk-doc