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

treewide: remove lib.{lists,string}.optional*

Browse Source
This commit is contained in:
Sandro Jäckel 2021-07-29 14:15:12 +02:00
parent 9f4fe8201b
commit 14af34c2f4
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
};
patches = lib.lists.optional withTracing ./tracing.patch;
patches = lib.optional withTracing ./tracing.patch;
nativeBuildInputs = [ cmake ];
buildInputs = [ opencl-headers ];

8
pkgs/development/libraries/libayatana-appindicator/default.nix
View File

@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
buildInputs =
lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2
++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3;
lib.optional (gtkVersion == "2") libayatana-indicator-gtk2
++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3;
propagatedBuildInputs =
lib.lists.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
++ lib.lists.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
preAutoreconf = ''
gtkdocize

4
pkgs/development/libraries/libayatana-indicator/default.nix
View File

@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ ayatana-ido ]
++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ]
++ lib.lists.optionals (gtkVersion == "3") [ gtk3 ];
++ lib.optionals (gtkVersion == "2") [ gtk2 ]
++ lib.optionals (gtkVersion == "3") [ gtk3 ];
configureFlags = [ "--with-gtk=${gtkVersion}" ];

2
pkgs/development/python-modules/bootstrapped-pip/2.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'' + ''
# Give folders a known name

2
pkgs/development/python-modules/bootstrapped-pip/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'' + ''
# Give folders a known name

2
pkgs/development/python-modules/setuptools/44.0.nix
View File

@ -61,7 +61,7 @@ in buildPythonPackage rec {
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
];
preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'';

2
pkgs/development/python-modules/setuptools/default.nix
View File

@ -62,7 +62,7 @@ in buildPythonPackage rec {
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
];
preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'';

2
pkgs/tools/backup/tsm-client/default.nix
View File

@ -152,7 +152,7 @@ buildEnv {
ln --symbolic --no-target-directory opt/tivoli/tsm/client/api/bin64 $out/dsmi_dir
ln --symbolic --no-target-directory "${dsmSysCli}" $out/dsm_dir/dsm.sys
ln --symbolic --no-target-directory "${dsmSysApi}" $out/dsmi_dir/dsm.sys
${lib.strings.optionalString (jdk8==null) "rm $out/bin/dsmj"}
${lib.optionalString (jdk8==null) "rm $out/bin/dsmj"}
for bin in $out/bin/*
do
target=$(readlink "$bin")