Unverified Commit 14af34c2 authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

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

parent 9f4fe820

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

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

pkgs/development/libraries/libayatana-appindicator/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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

pkgs/development/libraries/libayatana-indicator/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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}" ];

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

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/development/python-modules/bootstrapped-pip/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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