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

treewide: Fix more 'lib.optional' misuses

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-10-01 23:47:19 +03:00
parent 4059854351
commit eda2dd3d2f
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/vis/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
libtermkey libtermkey
lua lua
lpeg lpeg
] ++ stdenv.lib.optional stdenv.isLinux [ ] ++ stdenv.lib.optionals stdenv.isLinux [
acl acl
libselinux libselinux
]; ];

6
pkgs/development/interpreters/erlang/R16.nix
View File

@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ perl gnum4 ncurses openssl makeWrapper [ perl gnum4 ncurses openssl makeWrapper
] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] ] ++ optionals wxSupport [ mesa wxGTK xorg.libX11 ]
++ optional odbcSupport [ unixODBC ] ++ optional odbcSupport unixODBC
++ optional stdenv.isDarwin [ Carbon Cocoa ]; ++ optionals stdenv.isDarwin [ Carbon Cocoa ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';

4
pkgs/games/residualvm/default.nix
View File

@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ]
++ optional openglSupport [ mesa ]; ++ optional openglSupport mesa;
configureFlags="--enable-all-engines"; configureFlags = [ "--enable-all-engines" ];
meta = { meta = {
description = "Interpreter for LucasArts' Lua-based 3D adventure games"; description = "Interpreter for LucasArts' Lua-based 3D adventure games";

2
pkgs/tools/graphics/gnuplot/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; })
++ lib.optional withLua lua ++ lib.optional withLua lua
++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
++ lib.optional withQt [ qt ] ++ lib.optional withQt qt
# compiling with wxGTK causes a malloc (double free) error on darwin # compiling with wxGTK causes a malloc (double free) error on darwin
++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK;

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

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
buildInputs = [ libdv libjpeg libpng pkgconfig ] buildInputs = [ libdv libjpeg libpng pkgconfig ]
++ lib.optional (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ];
NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL"; NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL";