mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 00:53:12 +03:00
treewide: fix nested lists in *buildInputs
This commit is contained in:
parent
a012d5eebb
commit
8a227a2341
@ -73,7 +73,7 @@ let
|
||||
'';
|
||||
|
||||
# Splicer will pull out correct variations
|
||||
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
|
||||
libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
|
||||
++ [libffi]
|
||||
++ stdenv.lib.optional (!enableIntegerSimple) gmp
|
||||
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
|
||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
./hooks/drop-icon-theme-cache.sh
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ setupHooks perl pkgconfig gettext gobject-introspection ];
|
||||
nativeBuildInputs = setupHooks ++ [ perl pkgconfig gettext gobject-introspection ];
|
||||
|
||||
patches = [
|
||||
./patches/2.0-immodules.cache.patch
|
||||
|
@ -115,8 +115,7 @@ stdenv.mkDerivation rec {
|
||||
pkgconfig
|
||||
python3
|
||||
sassc
|
||||
setupHooks
|
||||
] ++ optionals withGtkDoc [
|
||||
] ++ setupHooks ++ optionals withGtkDoc [
|
||||
docbook_xml_dtd_43
|
||||
docbook_xsl
|
||||
gtk-doc
|
||||
|
Loading…
Reference in New Issue
Block a user