Unverified Commit 1e27109d authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #234897 from figsoda/optionals 

treewide: don't use lib.optional with a list
parents 1f6c354c 3605f48b

pkgs/applications/graphics/ipe/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec { 
    "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged

  ];



  qtWrapperArgs = lib.optional withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texlive ]}" ];

  qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texlive ]}" ];



  enableParallelBuilding = true;

pkgs/development/libraries/mpfr/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec { 


  configureFlags = lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe"

    ++ lib.optional stdenv.hostPlatform.is64bit "--with-pic"

    ++ lib.optional stdenv.hostPlatform.isPower64 [

    ++ lib.optionals stdenv.hostPlatform.isPower64 [

      # Without this, the `tget_set_d128` test experiences a link

      # error due to missing `__dpd_trunctdkf`.

      "--disable-decimal-float"

pkgs/development/python-modules/python-mapnik/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ buildPythonPackage rec { 
    "test_visual_zoom_all_rendering1"

    "test_visual_zoom_all_rendering2"

    "test_wgs84_inverse_forward"

  ] ++ lib.optional stdenv.isDarwin [

  ] ++ lib.optionals stdenv.isDarwin [

    "test_passing_pycairo_context_pdf"

  ];

pkgs/development/tools/rust/cargo-dephell/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { 


  buildInputs = [

    openssl

  ] ++ lib.optional stdenv.isDarwin [

  ] ++ lib.optionals stdenv.isDarwin [

    curl

    darwin.apple_sdk.frameworks.Security

    libgit2_1_3_0

pkgs/misc/ghostscript/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ let 


in

stdenv.mkDerivation rec {

  pname = "ghostscript${lib.optionalString (x11Support) "-with-X"}";

  pname = "ghostscript${lib.optionalString x11Support "-with-X"}";

  version = "10.01.1";



  src = fetchurl {
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec { 
  ] ++ lib.optionals dynamicDrivers [

    "--enable-dynamic"

    "--disable-hidden-visibility"

  ] ++ lib.optional x11Support [

  ] ++ lib.optionals x11Support [

    "--with-x"

  ] ++ lib.optionals cupsSupport [

    "--enable-cups"