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

treewide: Fix 'lib.optional' misuses

Browse Source 
These add a singleton list of a package to buildInputs.
This commit is contained in:
Tuomas Tynkkynen 2016-10-01 23:38:06 +03:00
parent c61cc2d56c
commit 5bf5de58ea
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/cd-discid/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
installFlags = "PREFIX=$(out) INSTALL=install";
buildInputs = []
++ stdenv.lib.optional stdenv.isDarwin [ IOKit ];
++ stdenv.lib.optional stdenv.isDarwin IOKit;
meta = with stdenv.lib; {
homepage = http://linukz.org/cd-discid.shtml;

2
pkgs/applications/graphics/feh/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" ];
nativeBuildInputs = [ makeWrapper xorg.libXt ]
++ stdenv.lib.optional doCheck [ perlPackages.TestCommand perlPackages.TestHarness ];
++ stdenv.lib.optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ];
buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];

2
pkgs/applications/networking/cluster/spark/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
++ optional mesosSupport [ mesos ];
++ optional mesosSupport mesos;
untarDir = "${name}-bin-cdh4";
installPhase = ''

2
pkgs/applications/networking/mumble/default.nix
View File

@ -104,7 +104,7 @@ let
"CONFIG+=no-client"
];
buildInputs = [ libcap ] ++ optional iceSupport [ zeroc_ice ];
buildInputs = [ libcap ] ++ optional iceSupport zeroc_ice;
};
stableSource = rec {

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

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk
libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
++ optionals waylandSupport [ wayland wayland-protocols ]
++ optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ])
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ])
++ optional xineramaSupport libXinerama
++ optional cupsSupport cups;
#TODO: colord?

2
pkgs/development/libraries/librsvg/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]
++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ];
++ stdenv.lib.optional enableIntrospection gobjectIntrospection;
propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;

2
pkgs/development/libraries/openal-soft/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake ]
++ optional alsaSupport alsaLib
++ optional pulseSupport libpulseaudio
++ optional stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
NIX_LDFLAGS = []
++ optional alsaSupport "-lasound"

2
pkgs/development/libraries/png++/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
postCheck = "cat test/test.log";
buildInputs = [ ]
++ stdenv.lib.optional docSupport [ doxygen ];
++ stdenv.lib.optional docSupport doxygen;
propagatedBuildInputs = [ libpng ];

2
pkgs/games/openttd/default.nix
View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ SDL libpng xz zlib freetype fontconfig ]
++ stdenv.lib.optional withFluidSynth [ fluidsynth soundfont-fluid ];
++ stdenv.lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ];
prefixKey = "--prefix-dir=";

2
pkgs/tools/networking/openssh/default.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
++ optional withGssapiPatches gssapiSrc;
buildInputs = [ zlib openssl libedit pkgconfig pam ]
++ optional withKerberos [ kerberos ];
++ optional withKerberos kerberos;
# I set --disable-strip because later we strip anyway. And it fails to strip
# properly when cross building.

2
pkgs/tools/networking/swec/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ makeWrapper perl LWP URI HTMLParser ]
++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ];
++ stdenv.lib.optionals doCheck [ HTTPServerSimple Parent ];
configurePhase = ''
for i in swec tests/{runTests,testServer}

2
pkgs/tools/video/atomicparsley/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with pkgs; [ unzip ]
++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
patches = [ ./casts.patch ];
setSourceRoot = "sourceRoot=${product}-source-${version}";
buildPhase = "bash build";

2
pkgs/top-level/perl-packages.nix
View File

@ -32,7 +32,7 @@ let self = _self // overrides; _self = with self; {
};
outputs = ["out" "doc"];
# use gnused so that the preCheck command passes
buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ];
buildInputs = stdenv.lib.optional stdenv.isDarwin gnused;
propagatedBuildInputs = [ FileNext ];
meta = with stdenv.lib; {
description = "A grep-like tool tailored to working with large trees of source code";

2
pkgs/top-level/python-packages.nix
View File

@ -2016,7 +2016,7 @@ in modules // {
};
propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma self.pycrypto ]
++ optional visualizationSupport [ pyqtgraph ];
++ optional visualizationSupport pyqtgraph;
meta = with stdenv.lib; {
homepage = "http://binwalk.org";