diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-09 23:14:38 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:57:57 +0100 |
| commit | 8a227a2341e8900b0fc7f8646c7102ef02515564 (patch) | |
| tree | 5220047e97ac8d8a181af1e093de329d5733ae59 /pkgs/development | |
| parent | a012d5eebba466d778945573295b22b2a0a1f3fd (diff) | |
| download | nixpkgs-8a227a2341e8900b0fc7f8646c7102ef02515564.tar nixpkgs-8a227a2341e8900b0fc7f8646c7102ef02515564.tar.gz nixpkgs-8a227a2341e8900b0fc7f8646c7102ef02515564.tar.bz2 nixpkgs-8a227a2341e8900b0fc7f8646c7102ef02515564.tar.lz nixpkgs-8a227a2341e8900b0fc7f8646c7102ef02515564.tar.xz nixpkgs-8a227a2341e8900b0fc7f8646c7102ef02515564.tar.zst nixpkgs-8a227a2341e8900b0fc7f8646c7102ef02515564.zip | |
treewide: fix nested lists in *buildInputs
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.5.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/2.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index f285e271c62..c5f48940dac 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -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; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 4286d6a73fb..932527eed09 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -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 diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 5a2d9159cac..60432614433 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -115,8 +115,7 @@ stdenv.mkDerivation rec { pkgconfig python3 sassc - setupHooks - ] ++ optionals withGtkDoc [ + ] ++ setupHooks ++ optionals withGtkDoc [ docbook_xml_dtd_43 docbook_xsl gtk-doc |