treewide: remove lib.{lists,string}.optional*
This commit is contained in:
parent
9f4fe8201b
commit
14af34c2f4
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
|
sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.lists.optional withTracing ./tracing.patch;
|
patches = lib.optional withTracing ./tracing.patch;
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ opencl-headers ];
|
buildInputs = [ opencl-headers ];
|
||||||
|
|
|
@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
|
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2
|
lib.optional (gtkVersion == "2") libayatana-indicator-gtk2
|
||||||
++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3;
|
++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3;
|
||||||
|
|
||||||
propagatedBuildInputs =
|
propagatedBuildInputs =
|
||||||
lib.lists.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
|
lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
|
||||||
++ lib.lists.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
|
++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
|
||||||
|
|
||||||
preAutoreconf = ''
|
preAutoreconf = ''
|
||||||
gtkdocize
|
gtkdocize
|
||||||
|
|
|
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||||
|
|
||||||
buildInputs = [ ayatana-ido ]
|
buildInputs = [ ayatana-ido ]
|
||||||
++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ]
|
++ lib.optionals (gtkVersion == "2") [ gtk2 ]
|
||||||
++ lib.lists.optionals (gtkVersion == "3") [ gtk3 ];
|
++ lib.optionals (gtkVersion == "3") [ gtk3 ];
|
||||||
|
|
||||||
configureFlags = [ "--with-gtk=${gtkVersion}" ];
|
configureFlags = [ "--with-gtk=${gtkVersion}" ];
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
|
installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||||
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||||
'' + ''
|
'' + ''
|
||||||
# Give folders a known name
|
# Give folders a known name
|
||||||
|
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
|
installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||||
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||||
'' + ''
|
'' + ''
|
||||||
# Give folders a known name
|
# Give folders a known name
|
||||||
|
|
|
@ -61,7 +61,7 @@ in buildPythonPackage rec {
|
||||||
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
|
(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
|
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ in buildPythonPackage rec {
|
||||||
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
|
(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
|
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,7 @@ buildEnv {
|
||||||
ln --symbolic --no-target-directory opt/tivoli/tsm/client/api/bin64 $out/dsmi_dir
|
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 "${dsmSysCli}" $out/dsm_dir/dsm.sys
|
||||||
ln --symbolic --no-target-directory "${dsmSysApi}" $out/dsmi_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/*
|
for bin in $out/bin/*
|
||||||
do
|
do
|
||||||
target=$(readlink "$bin")
|
target=$(readlink "$bin")
|
||||||
|
|
Loading…
Reference in a new issue