Commit 226e1491 authored by Artturin's avatar Artturin
Browse files

treewide: env.NIX_CFLAGS_COMPILE use optionalString instead of optional 

env values must be strings
parent 6b2a05e1

pkgs/applications/audio/grandorgue/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec { 
    "-DINSTALL_DEPEND=OFF"

  ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF";



  env.NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0";

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0";



  postInstall = lib.optionalString stdenv.isDarwin ''

    mkdir -p $out/{Applications,bin,lib}

pkgs/applications/graphics/gimp/default.nix

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


  doCheck = true;



  env.NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16";

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16";



  # Check if librsvg was built with --disable-pixbuf-loader.

  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";

pkgs/applications/graphics/gnuclad/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec { 
    sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";

  };



  env.NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isGNU "-Wno-error=catch-value";

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=catch-value";



  nativeBuildInputs = [ pkg-config ];

pkgs/applications/misc/gpsbabel/default.nix

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


  # Floating point behavior on i686 causes nmea.test failures. Preventing

  # extended precision fixes this problem.

  env.NIX_CFLAGS_COMPILE = lib.optional stdenv.isi686 "-ffloat-store";

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-ffloat-store";



  doCheck = true;

pkgs/applications/networking/mumble/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ let 
      ++ lib.optional (!pipewireSupport) "-D pipewire=OFF"

      ++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON";



    env.NIX_CFLAGS_COMPILE = lib.optional speechdSupport "-I${speechd}/include/speech-dispatcher";

    env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd}/include/speech-dispatcher";



    postFixup = ''

      wrapProgram $out/bin/mumble \