Commit 3251013c authored by Artturin's avatar Artturin
Browse files

treewide: env.NIX_CFLAGS_COMPILE use toString on result of optionals 

env values must be strings
parent 226e1491

pkgs/applications/audio/furnace/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -63,11 +63,11 @@ stdenv.mkDerivation rec { 
    "-DWARNINGS_ARE_ERRORS=ON"

  ];



  env.NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [

  env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [

    # Needed with GCC 12 but breaks on darwin (with clang) or aarch64 (old gcc)

    "-Wno-error=mismatched-new-delete"

    "-Wno-error=use-after-free"

  ];

  ]);



  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

    # Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a

pkgs/applications/misc/opencpn/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -117,9 +117,9 @@ stdenv.mkDerivation rec { 


  cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];



  env.NIX_CFLAGS_COMPILE = lib.optionals (!stdenv.hostPlatform.isx86) [

  env.NIX_CFLAGS_COMPILE = toString (lib.optionals (!stdenv.hostPlatform.isx86) [

    "-DSQUISH_USE_SSE=0"

  ];

  ]);



  postInstall = lib.optionals stdenv.isDarwin ''

    mkdir -p $out/Applications

pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix

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


  cmakeFlags = [ "-DNoVoip=True" ]; # libtgvoip required



  env.NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "-U__ARM_NEON__" ];

  env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "-U__ARM_NEON__" ]);



  meta = with lib; {

    homepage = "https://github.com/ars3niy/tdlib-purple";

pkgs/applications/networking/remote/freerdp/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -175,11 +175,11 @@ stdenv.mkDerivation rec { 
    WITH_X11 = true;

  };



  env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [

  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [

    "-DTARGET_OS_IPHONE=0"

    "-DTARGET_OS_WATCH=0"

    "-include AudioToolbox/AudioToolbox.h"

  ];

  ]);



  NIX_LDFLAGS = lib.optionals stdenv.isDarwin [

    "-framework AudioToolbox"

pkgs/applications/office/gnucash/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ stdenv.mkDerivation rec { 
  # guile warning

  GUILE_AUTO_COMPILE="0";



  env.NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [

  env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [

    # Needed with GCC 12 but breaks on darwin (with clang) or older gcc

    "-Wno-error=use-after-free"

  ];

  ]);



  # `make check` target does not define its prerequisites but expects them to

  # have already been built.  The list of targets below was built through trial