Unverified Commit b025cb11 authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

Merge pull request #214996 from Stunkymonkey/optionalString-1 

treewide: use optionalString
parents 34f30851 cdb39a86

nixos/tests/predictable-interface-names.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: { 
  name = pkgs.lib.optionalString (!predictable) "un" + "predictable"

       + pkgs.lib.optionalString withNetworkd "Networkd";

  value = makeTest {

    name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}";

    name = "${lib.optionalString (!predictable) "un"}predictableInterfaceNames${lib.optionalString withNetworkd "-with-networkd"}";

    meta = {};



    nodes.machine = { lib, ... }: {

pkgs/applications/audio/espeak/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec { 
  prePatch = ''

    sed -e s,/bin/ln,ln,g -i src/Makefile

    sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile

  '' + (if portaudio.api_version == 19 then ''

  '' + (lib.optionalString (portaudio.api_version == 19) ''

    cp src/portaudio19.h src/portaudio.h

  '' else "");

  '');



  configurePhase = ''

    cd src

pkgs/applications/audio/musly/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ stdenv.mkDerivation { 
  };

  nativeBuildInputs = [ cmake ];

  buildInputs = [ eigen ffmpeg ];

  fixupPhase = if stdenv.isDarwin then ''

  fixupPhase = lib.optionalString stdenv.isDarwin ''

    install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly

    install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly

    install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib

  '' else "";

  '';



  meta = with lib; {

    homepage = "https://www.musly.org";

pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [ pkg-config wrapGAppsHook ];

  buildInputs = [ lightdm gtk3 glib ];



  postUnpack = if conf != "" then ''

  postUnpack = lib.optionalString (conf != "") ''

    cp ${builtins.toFile "config.h" conf} source/config.h

  '' else "";

  '';



  buildPhase = ''

    mkdir -p $out/bin $out/share/xgreeters

pkgs/applications/editors/texmacs/common.nix

+8 −8
Original line number Diff line number Diff line
@@ -27,18 +27,18 @@ rec { 


  postPatch = (if tex == null then ''

    gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)

   '' else if extraFonts then ''

   '' else lib.optionalString extraFonts ''

    gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -)

   '' else "") +

   (if chineseFonts then ''

   '') +

   (lib.optionalString chineseFonts ''

    gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -)

   '' else "") +

   (if japaneseFonts then ''

   '') +

   (lib.optionalString japaneseFonts ''

    gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -)

   '' else "") +

   (if koreanFonts then ''

   '') +

   (lib.optionalString koreanFonts ''

    gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -)

   '' else "");

   '');





  meta = {