diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index f4688f34982..b0f1f0eae25 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index 53b0dca0912..df1c6683fbc 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -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 diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix index c3c271c1719..f4871538eff 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/development/libraries/libayatana-indicator/default.nix @@ -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}" ]; diff --git a/pkgs/development/python-modules/bootstrapped-pip/2.nix b/pkgs/development/python-modules/bootstrapped-pip/2.nix index 2d06b44b507..f89d39ae2b7 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/2.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/2.nix @@ -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 diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 81aca3f3c57..84016043929 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -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 diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix index 7c7d6b01e40..40265dc639b 100644 --- a/pkgs/development/python-modules/setuptools/44.0.nix +++ b/pkgs/development/python-modules/setuptools/44.0.nix @@ -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 ''; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 2c8f5d898dc..62e7fb686c4 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -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 ''; diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index c432d47becd..e298751faca 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -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")