Merge remote-tracking branch 'upstream/master' into structured-attrs

jq: fix build with structured-attrs on darwin
imag: fix build with structured-attrs
2026-01-12 10:50:30 +08:00 · 2021-05-24 09:55:24 -05:00 · 2021-05-01 09:57:56 -05:00 · 2021-04-30 14:15:01 -05:00 · 2021-04-30 14:02:43 -05:00 · 2021-04-29 20:50:03 -05:00
1147 changed files with 2873 additions and 5238 deletions
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -11,12 +11,11 @@ let
  etc = pkgs.stdenvNoCC.mkDerivation {
    name = "etc";

-    builder = ./make-etc.sh;
+    buildCommand = builtins.readFile ./make-etc.sh;

    preferLocalBuild = true;
    allowSubstitutes = false;

-    /* !!! Use toXML. */
    sources = map (x: x.source) etc';
    targets = map (x: x.target) etc';
    modes = map (x: x.mode) etc';
--- a/nixos/modules/system/etc/make-etc.sh
+++ b/nixos/modules/system/etc/make-etc.sh
@@ -1,25 +1,15 @@
-source $stdenv/setup
+mkdir -p "$out/etc"

-mkdir -p $out/etc
-
-set -f
-sources_=($sources)
-targets_=($targets)
-modes_=($modes)
-users_=($users)
-groups_=($groups)
-set +f
-
-for ((i = 0; i < ${#targets_[@]}; i++)); do
-    source="${sources_[$i]}"
-    target="${targets_[$i]}"
+for ((i = 0; i < ${#targets[@]}; i++)); do
+    source="${sources[$i]}"
+    target="${targets[$i]}"

    if [[ "$source" =~ '*' ]]; then

        # If the source name contains '*', perform globbing.
-        mkdir -p $out/etc/$target
+        mkdir -p "$out/etc/$target"
        for fn in $source; do
-            ln -s "$fn" $out/etc/$target/
+            ln -s "$fn" "$out/etc/$target/"
        done

    else
--- a/pkgs/applications/audio/aacgain/default.nix
+++ b/pkgs/applications/audio/aacgain/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {

  # -Wnarrowing is enabled by default in recent GCC versions,
  # causing compilation to fail.
-  NIX_CFLAGS_COMPILE = "-Wno-narrowing";
+  env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";

  postPatch = ''
    (
--- a/pkgs/applications/audio/ardour/5.nix
+++ b/pkgs/applications/audio/ardour/5.nix
@@ -119,7 +119,7 @@ in stdenv.mkDerivation rec {
    "--with-backends=jack,alsa,dummy"
  ];

-  NIX_CFLAGS_COMPILE = "-I${qm-dsp}/include/qm-dsp";
+  env.NIX_CFLAGS_COMPILE = "-I${qm-dsp}/include/qm-dsp";

  # ardour's wscript has a "tarball" target but that required the git revision
  # be available. Since this is an unzipped tarball fetched from github we
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -169,7 +169,7 @@ stdenv.mkDerivation rec {
      --prefix PATH : "${lib.makeBinPath [ harvid xjadeo ]}"
  '';

-  LINKFLAGS = "-lpthread";
+  env.LINKFLAGS = "-lpthread";

  meta = with lib; {
    description = "Multi-track hard disk recording software";
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -40,6 +40,7 @@ mkDerivation rec {
  # derivations, since they really expect to be in the same prefix.
  # This is slighly tricky.
  builder = builtins.toFile "builder.sh" ''
+    source .attrs.sh
    # First build audacious.
    (
      source $stdenv/setup
@@ -47,7 +48,7 @@ mkDerivation rec {
    )
    # Then build the plugins.
    (
-      nativeBuildInputs="$out $nativeBuildInputs" # to find audacious
+      nativeBuildInputs+=("''${outputs[out]}") # to find audacious
      source $stdenv/setup
      rm -rfv audacious-*
      src=$pluginsSrc
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
  '';

  # audacity only looks for ffmpeg at runtime, so we need to link it in manually
-  NIX_LDFLAGS = toString [
+  env.NIX_LDFLAGS = toString [
    "-lavcodec"
    "-lavdevice"
    "-lavfilter"
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  };

  # https://bugs.launchpad.net/audio-recorder/+bug/1784622
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+  env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

  nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];

--- a/pkgs/applications/audio/axoloti/libusb1.nix
+++ b/pkgs/applications/audio/axoloti/libusb1.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    })
  ];

-  NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
+  env.NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";

  preFixup = lib.optionalString stdenv.isLinux ''
    sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {

  patches = [ ./darwin-limits.patch ];

-  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot";
-  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework MultitouchSupport";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot";
+  env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework MultitouchSupport";

  postPatch = ''
    substituteInPlace src/core/makefile.x/makefile.osx \
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
    sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw";
  };

-  NIX_LDFLAGS = "-lid3tag -lz";
+  env.NIX_LDFLAGS = "-lid3tag -lz";

  nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ];
  buildInputs = [
--- a/pkgs/applications/audio/ecasound/default.nix
+++ b/pkgs/applications/audio/ecasound/default.nix
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {

  strictDeps = true;

-  CXXFLAGS = "-std=c++11";
-  configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0";
+  env.CXXFLAGS = "-std=c++11";
+  configureFlags = [ "--enable-liblilv" "--with-extra-cppflags=-Dnullptr=0" ];

  postPatch = ''
    sed -i -e '
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
    ./format.patch
  ];

-  CFLAGS = lib.optionalString debug " -DDEBUG=2";
+  env.CFLAGS = lib.optionalString debug " -DDEBUG=2";

  meta = {
    homepage = "http://eflite.sourceforge.net";
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -58,9 +58,7 @@ let
      cd build
    '';

-    cmakeFlags = ''
-      -C ../backends/all.cmake -C  ../targets/all.cmake ..
-    '';
+    cmakeFlags = [ "-C ../backends/all.cmake" "-C  ../targets/all.cmake .." ];

    postInstall = ''
      # syntax error when eval'd directly
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
      configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
    }))
  ];
-  NIX_CFLAGS_COMPILE = toString
+  env.NIX_CFLAGS_COMPILE = toString
    (makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ]);

  hardeningDisable = [ "format" ];
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -38,12 +38,12 @@ stdenv.mkDerivation rec {
         Cocoa
       ];

-  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin [
+  env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin (toString [
    "-framework CoreAudio"
    "-framework CoreMIDI"
    "-framework CoreServices"
    "-framework Cocoa"
-  ];
+  ]);

  passthru.tests = {
    ft2-clone-starts = nixosTests.ft2-clone;
--- a/pkgs/applications/audio/grandorgue/default.nix
+++ b/pkgs/applications/audio/grandorgue/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ pkg-config fftwFloat alsaLib zlib wavpack wxGTK31 udev ]
    ++ lib.optional jackaudioSupport libjack2;

-  cmakeFlags = lib.optional (!jackaudioSupport) [
+  cmakeFlags = lib.optionals (!jackaudioSupport) [
    "-DRTAUDIO_USE_JACK=OFF"
    "-DRTMIDI_USE_JACK=OFF"
  ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF";
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -29,7 +29,7 @@
    freetype alsaLib curl libjack2 pkg-config libGLU libGL lv2
  ];

-  CXXFLAGS = "-DHAVE_LROUND";
+  env.CXXFLAGS = "-DHAVE_LROUND";

  patches = [
    # gcc9 compatibility https://github.com/mtytel/helm/pull/233
--- a/pkgs/applications/audio/hivelytracker/default.nix
+++ b/pkgs/applications/audio/hivelytracker/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
  ];

  # TODO: try to exclude gtk and glib from darwin builds
-  NIX_CFLAGS_COMPILE = [
+  env.NIX_CFLAGS_COMPILE = toString [
    "-I${SDL}/include/SDL"
    "-I${SDL_image}/include/SDL"
    "-I${SDL_ttf}/include/SDL"
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  };
  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 lrdf ];
-  NIX_LDFLAGS = "-ldl -lm -lpthread";
+  env.NIX_LDFLAGS = "-ldl -lm -lpthread";

  meta = {
    description = ''An effects "rack" for the JACK low latency audio API'';
--- a/pkgs/applications/audio/jamin/default.nix
+++ b/pkgs/applications/audio/jamin/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 ]
    ++ (with perlPackages; [ perl XMLParser ]);

-  NIX_LDFLAGS = "-ldl";
+  env.NIX_LDFLAGS = "-ldl";

  postInstall = ''
    wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
  ];

  cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ];
-  NIX_LDFLAGS = "-lm -lpthread";
+  env.NIX_LDFLAGS = "-lm -lpthread";

  preConfigure = ''
    export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/"
--- a/pkgs/applications/audio/klick/default.nix
+++ b/pkgs/applications/audio/klick/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ];
  buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ];
  prefixKey = "PREFIX=";
-  NIX_CFLAGS_COMPILE = "-fpermissive";
+  env.NIX_CFLAGS_COMPILE = "-fpermissive";

  meta = {
    homepage = "http://das.nasophon.de/klick/";
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation  rec {
  nativeBuildInputs = [ pkg-config makeWrapper ];
  buildInputs = [ alsaLib gtk2 libjack2 libxml2 readline ];
  propagatedBuildInputs = [ libuuid ];
-  NIX_LDFLAGS = "-lm -lpthread -luuid";
+  env.NIX_LDFLAGS = "-lm -lpthread -luuid";

  postInstall = ''
    for i in lash_control lash_panel
--- a/pkgs/applications/audio/littlegptracker/default.nix
+++ b/pkgs/applications/audio/littlegptracker/default.nix
@@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
    ++ lib.optionals stdenv.isLinux  [ "PLATFORM=DEB" ]
    ++ lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ];

-  NIX_CFLAGS_COMPILE = [ "-fpermissive" ] ++
-    lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing";
+  env.NIX_CFLAGS_COMPILE = "-fpermissive" +
+    lib.optionalString stdenv.hostPlatform.isAarch64 " -Wno-error=narrowing";

-  NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework Foundation";
+  env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation";

  installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe";
    in "install -Dm555 lgpt.${extension} $out/bin/lgpt";
--- a/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/pkgs/applications/audio/lsp-plugins/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
    "ETC_PATH=$(out)/etc"
  ];

-  NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL";
+  env.NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL";

  doCheck = true;

--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -45,7 +45,7 @@ mkDerivation rec {
  ];

  qtWrapperArgs = [
-    "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
+    "--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive"
  ];

  meta = with lib; {
--- a/pkgs/applications/audio/mp3blaster/default.nix
+++ b/pkgs/applications/audio/mp3blaster/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
    libvorbis
  ] ++ lib.optional stdenv.isDarwin SDL;

-  NIX_CFLAGS_COMPILE = toString ([
+  env.NIX_CFLAGS_COMPILE = toString ([
    "-Wno-narrowing"
  ] ++ lib.optionals stdenv.cc.isClang [
    "-Wno-reserved-user-defined-literal"
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
  qtWrapperArgs = [
    # Work around crash on update from 3.4.2 to 3.5.0
    # https://bugreports.qt.io/browse/QTBUG-85967
-    "--set QML_DISABLE_DISK_CACHE 1"
+    "--set" "QML_DISABLE_DISK_CACHE" "1"
  ];

  nativeBuildInputs = [ cmake pkg-config ];
--- a/pkgs/applications/audio/oxefmsynth/default.nix
+++ b/pkgs/applications/audio/oxefmsynth/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
    sha256 = "1rk71ls33a38wx8i22plsi7d89cqqxrfxknq5i4f9igsw1ipm4gn";
  };

-  NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ];
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";

  buildFlags = [ "VSTSDK_PATH=${vst-sdk}/VST2_SDK" ];

--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {

  makeFlags = [ "PREFIX=$(out)" ];

-  CC = "gcc";
-  CFLAGS = "-std=c99";
+  env.CC = "gcc";
+  env.CFLAGS = "-std=c99";

  meta = with lib; {
    description = "A console front-end for Pandora.com";
--- a/pkgs/applications/audio/picoloop/default.nix
+++ b/pkgs/applications/audio/picoloop/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {

  makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ];

-  NIX_CFLAGS_COMPILE = [ "-I${SDL2.dev}/include/SDL2" ];
+  env.NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2";

  hardeningDisable = [ "format" ];

--- a/pkgs/applications/audio/pragha/default.nix
+++ b/pkgs/applications/audio/pragha/default.nix
@@ -81,9 +81,9 @@ mkDerivation rec {
  # ++ lib.optional withRygel rygel
  ;

-  CFLAGS = [ "-DHAVE_PARANOIA_NEW_INCLUDES" ];
+  env.CFLAGS = "-DHAVE_PARANOIA_NEW_INCLUDES";

-  NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0";
+  env.NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0";

  postInstall = ''
    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/applications/audio/sayonara/default.nix
@@ -56,7 +56,7 @@ mkDerivation rec {
  ];

  # gstreamer cannot otherwise be found
-  NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
+  env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";

  postInstall = ''
    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
  # Without it doesn't find all of the boost libraries.
  BOOST_LIB_DIR="${boost}/lib";
  # uses the deprecated get_generic_category() in boost_system
-  NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";
+  env.NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";

  LC_ALL = "en_US.UTF-8";

--- a/pkgs/applications/audio/squishyball/default.nix
+++ b/pkgs/applications/audio/squishyball/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ flac libao libvorbis ncurses opusfile ];

-  NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS";
+  env.NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS";

  patches = [ ./gnu-screen.patch ];

--- a/pkgs/applications/audio/timemachine/default.nix
+++ b/pkgs/applications/audio/timemachine/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

  preConfigure = "./autogen.sh";

-  NIX_LDFLAGS = "-lm";
+  env.NIX_LDFLAGS = "-lm";

  meta = {
    description = "JACK audio recorder";
--- a/pkgs/applications/blockchains/dashpay.nix
+++ b/pkgs/applications/blockchains/dashpay.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
                  miniupnpc protobuf qrencode util-linux ];


-  configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--with-gui=no" ]
                    ++ optional enable_Upnp "--enable-upnp-default"
                    ++ optional disable_Wallet "--disable-wallet"
                    ++ optional disable_Daemon "--disable-daemon"
--- a/pkgs/applications/blockchains/electrs.nix
+++ b/pkgs/applications/blockchains/electrs.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {

  # needed for librocksdb-sys
  nativeBuildInputs = [ llvmPackages.clang ];
-  LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+  env.LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

  cargoSha256 = "1rqpadlr9r4z2z825li6vi5a21hivc3bsn5ibxshrdrwiycyyxz8";

--- a/pkgs/applications/blockchains/openethereum/default.nix
+++ b/pkgs/applications/blockchains/openethereum/default.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {

  # Exclude some tests that don't work in the sandbox
  # - Nat test requires network access
-  checkFlags = "--skip configuration::tests::should_resolve_external_nat_hosts";
+  checkFlags = [ "--skip configuration::tests::should_resolve_external_nat_hosts" ];

  meta = with lib; {
    description = "Fast, light, robust Ethereum implementation";
--- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
    configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" )
  '';

-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

  installFlags = [
    "localstatedir=\${TMPDIR}"
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
    ++ lib.optional (widgetset == "gtk3") gtk3
    ++ lib.optional (widgetset == "qt5") libqt5pas;

-  NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
+  env.NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";

  buildPhase = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dep: ''
    cp -r --no-preserve=mode ${dep} ${name}
--- a/pkgs/applications/editors/deadpixi-sam/default.nix
+++ b/pkgs/applications/editors/deadpixi-sam/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
      --replace "CC=gcc" ""
  '';

-  CFLAGS = "-D_DARWIN_C_SOURCE";
+  env.CFLAGS = "-D_DARWIN_C_SOURCE";
  makeFlags = [ "DESTDIR=$(out)" ];
  buildInputs = [ libX11 libXi libXt libXft ];

--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -4,6 +4,13 @@ stdenv.mkDerivation rec {
  pname = "edbrowse";
  version = "3.7.7";

+  src = fetchFromGitHub {
+    owner = "CMB";
+    repo = "edbrowse";
+    rev = "v${version}";
+    sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf";
+  };
+
  buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];

  postPatch = ''
@@ -14,16 +21,10 @@ stdenv.mkDerivation rec {
  '';

  makeFlags = [
-    "-C" "src"
+    "-C src"
    "prefix=${placeholder "out"}"
  ];

-  src = fetchFromGitHub {
-    owner = "CMB";
-    repo = "edbrowse";
-    rev = "v${version}";
-    sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf";
-  };
  meta = with lib; {
    description = "Command Line Editor Browser";
    longDescription = ''
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -168,7 +168,7 @@ let

        irony = super.irony.overrideAttrs (old: {
          cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
-          NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
+          env.NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
          preConfigure = ''
            cd server
          '';
--- a/pkgs/applications/editors/gnome-latex/default.nix
+++ b/pkgs/applications/editors/gnome-latex/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {

  doCheck = true;

-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+  env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

  passthru.updateScript = gnome.updateScript {
    packageName = pname;
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -10,8 +10,11 @@ stdenv.mkDerivation rec {
    rev = "v${version}";
    sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk";
  };
+
  buildInputs = [ ncurses ];
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ];
+
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-overflow -Wno-error=stringop-truncation";
+
  patches = [
    # gcc7 compat
    (fetchpatch {
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  patches = [ ./gcc7.patch ];

-  NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ];
+  env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";

  meta = with lib; {
    description = "File editor/viewer/analyzer for executables";
--- a/pkgs/applications/editors/jupyter/default.nix
+++ b/pkgs/applications/editors/jupyter/default.nix
@@ -13,6 +13,6 @@ in

 with python3.pkgs; toPythonModule (
  notebook.overridePythonAttrs(oldAttrs: {
-    makeWrapperArgs = ["--set JUPYTER_PATH ${jupyterPath}"];
+    makeWrapperArgs = [ "--set" "JUPYTER_PATH" jupyterPath ];
  })
 )
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  # the linux config works fine on darwin too!
  buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux";

-  NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib";
+  env.NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib";

  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/applications/editors/texmacs/darwin.nix
+++ b/pkgs/applications/editors/texmacs/darwin.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {

  GUILE_CPPFLAGS="-D_THREAD_SAFE -I${guile_1_8.dev}/include -I${guile_1_8.dev}/include/guile ";

-  NIX_LDFLAGS="${zlib}/lib/libz.dylib";
+  env.NIX_LDFLAGS="${zlib}/lib/libz.dylib";

  buildPhase = ''
    substituteInPlace Makefile \
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -40,7 +40,7 @@ mkDerivation {
    git
    python3
  ];
-  NIX_LDFLAGS = "-lz";
+  env.NIX_LDFLAGS = "-lz";

  qtWrapperArgs = [
    "--suffix" "PATH" ":" (lib.makeBinPath [
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -11,7 +11,7 @@ mkDerivation rec {

  buildInputs = [ qtbase qtscript poppler zlib ];
  nativeBuildInputs = [ pkg-config poppler qmake ];
-  NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
+  env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";

  qmakeFlags = [
    "DESKTOPDIR=${placeholder "out"}/share/applications"
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
    done
  '';

-  NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
+  env.NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";

  postInstall = ''
    wrapProgram $out/bin/grass76 \
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -80,7 +80,7 @@ mkDerivation rec {

  enableParallelBuilding = true;

-  CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
+  env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";

  meta = with lib; {
    description = "System for Automated Geoscientific Analyses";
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    gst_all_1.gst-plugins-base
  ] ++ lib.optional useUnrar unrar;

-  NIX_LDFLAGS = "-lpthread";
+  env.NIX_LDFLAGS = "-lpthread";

  postPatch = "patchShebangs version.sh";

--- a/pkgs/applications/graphics/apngasm/2.nix
+++ b/pkgs/applications/graphics/apngasm/2.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
    rm -rf libpng zlib zopfli
  '';

-  NIX_CFLAGS_LINK = "-lzopfli";
+  env.NIX_CFLAGS_LINK = "-lzopfli";

  installPhase = ''
    install -Dt $out/bin apngasm
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -3,7 +3,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "dosage";
  version = "2018.04.08";
-  PBR_VERSION = version;
+  env.PBR_VERSION = version;

  src = fetchFromGitHub {
    owner = "webcomics";
--- a/pkgs/applications/graphics/fluxus/default.nix
+++ b/pkgs/applications/graphics/fluxus/default.nix
@@ -78,10 +78,9 @@ stdenv.mkDerivation rec {
    "RacketLib=${racket}/lib/racket"
    "LIBPATH=${lib.makeLibraryPath libs}"
    "DESTDIR=build"
+    "Prefix=${placeholder "out"}"
  ];
-  configurePhase = ''
-    sconsFlags+=" Prefix=$out"
-  '';
+
  installPhase = ''
    mkdir -p $out
    cp -r build$out/* $out/
--- a/pkgs/applications/graphics/freepv/default.nix
+++ b/pkgs/applications/graphics/freepv/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
      --replace png_set_gray_1_2_4_to_8 png_set_expand_gray_1_2_4_to_8
  '';

-  NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing";
+  env.NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing";

  meta = {
    description = "Open source panorama viewer using GL";
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -70,7 +70,7 @@ in
      url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2";
      sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
    };
-    NIX_LDFLAGS = "-lm";
+    env.NIX_LDFLAGS = "-lm";
    hardeningDisable = [ "format" ];
    meta = with lib; {
      description = "The GIMP Animation Package";
@@ -179,7 +179,7 @@ in
      Filters/Enhance/Wavelet sharpen
    */
    name = "wavelet-sharpen-0.1.2";
-    NIX_LDFLAGS = "-lm";
+    env.NIX_LDFLAGS = "-lm";
    src = fetchurl {
      url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz";
      sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
--- a/pkgs/applications/graphics/gnuclad/default.nix
+++ b/pkgs/applications/graphics/gnuclad/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
  };

-  NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ scons pkg-config wrapGAppsHook ];
  buildInputs = [ glfw3 gtk3 libpng12 ];
-  NIX_LDFLAGS = "-lpthread";
+  env.NIX_LDFLAGS = "-lpthread";

  buildPhase = ''
    make release
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {

  hardeningDisable = [ "format" ];

-  NIX_LDFLAGS = "-lm";
+  env.NIX_LDFLAGS = "-lm";

  meta = with lib; {
    description = "A fast image viewer";
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
  # disable installation of the python scripting interface
  cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];

-  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
+  env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";

  postInstall = ''
    for p in $out/bin/*; do
--- a/pkgs/applications/graphics/imgcat/default.nix
+++ b/pkgs/applications/graphics/imgcat/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    sha256 = "0frz40rjwi73nx2dlqvmnn56zwr29bmnngfb11hhwr7v58yfajdi";
  };

-  NIX_CFLAGS_COMPILE = "-Wno-error";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error";

  meta = with lib; {
    description = "It's like cat, but for images";
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -42,11 +42,11 @@ mkDerivation rec {
    zlib
  ];

-  IPEPREFIX=placeholder "out";
-  URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
-  LUA_PACKAGE = "lua";
+  env.IPEPREFIX = placeholder "out";
+  env.URWFONTDIR = "${texlive}/texmf-dist/fonts/type1/urw/";
+  env.LUA_PACKAGE = "lua";

-  qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin"  ];
+  qtWrapperArgs = [ "--prefix" "PATH" ":" "${texlive}/bin"  ];

  enableParallelBuilding = true;

--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {

  #doCheck = false;

-  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+  env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";

  meta = with lib; {
    description = "A 3D editor with support for procedural editing";
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -28,8 +28,8 @@ mkDerivation rec {
    python3Packages.pyqt5
  ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;

-  NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]
-    ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy";
+  env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"
+    + lib.optionalString stdenv.cc.isGNU " -Wno-deprecated-copy";

  cmakeFlags = [
    "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5"
--- a/pkgs/applications/graphics/lazpaint/default.nix
+++ b/pkgs/applications/graphics/lazpaint/default.nix
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {

  buildInputs = [ pango cairo glib atk gtk2 libX11 gdk-pixbuf ];

-  NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
+  env.NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";

  buildPhase = ''
    cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/pkgs/applications/graphics/luminance-hdr/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
    sha256 = "1izmgjjp8mgyxv57sjjr05z7g7059ykb5wchlcn4wrnnb6aslnvn";
  };

-  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
+  env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";

  buildInputs = [
    qtbase qtdeclarative qttools qtwebengine eigen
--- a/pkgs/applications/graphics/photoflare/default.nix
+++ b/pkgs/applications/graphics/photoflare/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {

  qmakeFlags = [ "PREFIX=${placeholder "out"}" ];

-  NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick";
+  env.NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick";

  meta = with lib; {
    description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface";
--- a/pkgs/applications/graphics/tesseract/tesseract3.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract3.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ pkg-config autoreconfHook ];
  buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];

-  LIBLEPT_HEADERSDIR = "${leptonica}/include";
+  env.LIBLEPT_HEADERSDIR = "${leptonica}/include";

  meta = {
    description = "OCR engine";
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ autoconf automake libtool pkg-config ];

-  NIX_LDFLAGS = "-lz"
+  env.NIX_LDFLAGS = "-lz"
    + lib.optionalString (!isGdkQuartzBackend) " -lX11";

  desktopItem = makeDesktopItem {
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
    ]
    ++ lib.optional withLua lua;

-  buildFlags = "translations";
+  buildFlags = [ "translations" ];

  hardeningDisable = [ "format" ];

--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -25,7 +25,7 @@ mkDerivation {
  ];
  propagatedBuildInputs = [ boost kitemmodels ];
  outputs = [ "out" "dev" ];
-  CXXFLAGS = [
+  env.CXXFLAGS = toString [
    ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mariadb}/bin/mysqld\"''
    ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mariadb}/bin/mysqladmin\"''
    ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mariadb}/bin/mysql_install_db\"''
--- a/pkgs/applications/kde/kdenlive/default.nix
+++ b/pkgs/applications/kde/kdenlive/default.nix
@@ -91,7 +91,7 @@ mkDerivation {
  # https://github.com/NixOS/nixpkgs/issues/83885
  # https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325
  qtWrapperArgs = [
-    "--set FREI0R_PATH ${frei0r}/lib/frei0r-1"
+    "--set" "FREI0R_PATH" "${frei0r}/lib/frei0r-1"
  ];

  preFixup = ''
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -19,5 +19,5 @@ mkDerivation {
    kdelibs4support kpty syntax-highlighting libmtp libssh openexr openslp
    phonon qtsvg samba solid gperf
  ];
-  CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ];
+  env.CXXFLAGS = "-I${ilmbase.dev}/include/OpenEXR";
 }
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -22,5 +22,5 @@ mkDerivation {
  outputs = [ "out" "dev" ];
  # Fix build with cups deprecations etc.
  # See: https://github.com/NixOS/nixpkgs/issues/73334
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security";
 }
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
    sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i";
  };

-  NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
+  env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";

  nativeBuildInputs = [
    cmake
--- a/pkgs/applications/misc/barrier/default.nix
+++ b/pkgs/applications/misc/barrier/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
  '';

  qtWrapperArgs = [
-    ''--prefix PATH : ${lib.makeBinPath [ openssl ]}''
+    "--prefix" "PATH" ":" (lib.makeBinPath [ openssl ])
  ];

  meta = {
--- a/pkgs/applications/misc/birdtray/default.nix
+++ b/pkgs/applications/misc/birdtray/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {

  # Wayland support is broken.
  # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315
-  qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ];
+  qtWrapperArgs = [ "--set" "QT_QPA_PLATFORM" "xcb" ];

  meta = with lib; {
    description = "Mail system tray notification icon for Thunderbird";
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -132,11 +132,11 @@ stdenv.mkDerivation rec {
      "-DOPTIX_ROOT_DIR=${optix}"
    ];

-  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}";
+  env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}";

  # Since some dependencies are built with gcc 6, we need gcc 6's
  # libstdc++ in our RPATH. Sigh.
-  NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib";
+  env.NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib";

  blenderExecutable =
    placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender");
--- a/pkgs/applications/misc/clipcat/default.nix
+++ b/pkgs/applications/misc/clipcat/default.nix
@@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "1ffgvhkdj8wkhlgi0cj0njdm9ycxq2qda4b5qn8bmaygzr2zkwpd";

-  LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+  env.LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

  # needed for internal protobuf c wrapper library
-  PROTOC = "${protobuf}/bin/protoc";
-  PROTOC_INCLUDE = "${protobuf}/include";
+  env.PROTOC = "${protobuf}/bin/protoc";
+  env.PROTOC_INCLUDE = "${protobuf}/include";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -33,7 +33,7 @@ mkDerivation rec {

  makeWrapperArgs = [
    # hacky workaround for https://github.com/NixOS/nixpkgs/issues/59901
-    "--set OMP_NUM_THREADS 1"
+    "--set" "OMP_NUM_THREADS" "1"
  ];

  postPatch = ''
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -79,22 +79,18 @@ in mkDerivation rec {
    qtmultimedia
  ];

-  LUPDATE="${qttools.dev}/bin/lupdate";
-  LRELEASE="${qttools.dev}/bin/lrelease";
-  MOC="${qtbase.dev}/bin/moc";
-  QTDIR=qtbase.dev;
-  RCC="${qtbase.dev}/bin/rcc";
-  UIC="${qtbase.dev}/bin/uic";
+  env.LUPDATE = "${qttools.dev}/bin/lupdate";
+  env.LRELEASE = "${qttools.dev}/bin/lrelease";
+  env.MOC = "${qtbase.dev}/bin/moc";
+  env.QTDIR = toString qtbase.dev;
+  env.RCC = "${qtbase.dev}/bin/rcc";
+  env.UIC = "${qtbase.dev}/bin/uic";

-  configureFlags = [
-    "--enable-libusb"
-  ];
+  configureFlags = [ "--enable-libusb" ];

-  hardeningDisable = [
-    "format"
-  ];
+  hardeningDisable = [ "format" ];

-  qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : $out/lib" ];
+  qtWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" "$out/lib" ];

  postInstall = ''
    mkdir -p "$out/lib"
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

  makeFlags = [
    "PREFIX=$(out)"
-    "VERSION=$(version)"
+    "VERSION=${version}"
    "SYSCONFDIR=$(out)/etc"
    "SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
    "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
--- a/pkgs/applications/misc/fbreader/default.nix
+++ b/pkgs/applications/misc/fbreader/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation {

  makeFlags = [ "INSTALLDIR=$(out)" ];

-  NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";

  meta = with lib; {
    description = "An e-book reader for Linux";
--- a/pkgs/applications/misc/getxbook/default.nix
+++ b/pkgs/applications/misc/getxbook/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
  };

-  NIX_CFLAGS_COMPILE = builtins.toString (
+  env.NIX_CFLAGS_COMPILE = builtins.toString (
    [ "-Wno-error=deprecated-declarations" ]
      ++ lib.optionals (!stdenv.cc.isClang) [
        "-Wno-error=format-truncation"
--- a/pkgs/applications/misc/gnome-recipes/default.nix
+++ b/pkgs/applications/misc/gnome-recipes/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {

  # https://github.com/NixOS/nixpkgs/issues/36468
  # https://gitlab.gnome.org/GNOME/recipes/issues/76
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+  env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

  postPatch = ''
    chmod +x src/list_to_c.py
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -40,9 +40,9 @@ in mkDerivation rec {
    })
  ];

-  NIX_LDFLAGS = "-lz";
+  env.NIX_LDFLAGS = "-lz";

-  qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ];
+  qtWrapperArgs = [ "--set" "LD_LIBRARY_PATH" "${zlib.out}/lib" ];

  preConfigure = ''
    cp src/gcconfig.pri.in src/gcconfig.pri
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
  hardeningDisable = [ "format" ];

  # glib-2.62 deprecations
-  NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
+  env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";

  meta = {
    description = "GTK-based audio CD player/ripper";
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/pkgs/applications/misc/gxneur/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
  };

  # glib-2.62 deprecations
-  NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
+  env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";

  nativeBuildInputs = [ pkg-config intltool ];
  buildInputs = [
--- a/pkgs/applications/misc/imag/default.nix
+++ b/pkgs/applications/misc/imag/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
    ++ lib.optional stdenv.isDarwin Security;
  checkInputs = [ gitMinimal util-linuxMinimal ];

-  LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+  env.LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

  cargoSha256 = "0n8cw70qh8g4hfwfaxwwxbrrx5hm2z037z8kdhvdpqkxljl9189x";

--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -151,7 +151,7 @@ in stdenv.mkDerivation rec {

  cmakeFlags = [ "-DCMAKE_C_FLAGS=-I${src}/include_mod" ];

-  NIX_LDFLAGS = "-lpthread";
+  env.NIX_LDFLAGS = "-lpthread";

  installPhase = ''
    install -D -m 755 k2pdfopt $out/bin/k2pdfopt
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -52,13 +52,13 @@ stdenv.mkDerivation rec {
    sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3";
  };

-  NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [
+  env.NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang (toString [
    "-Wno-old-style-cast"
    "-Wno-error"
    "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
-  ];
+  ]);

-  NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
+  env.NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";

  patches = [
    ./darwin.patch
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -44,7 +44,7 @@ mkDerivation rec {
    mv $out/lib/klayout $out/bin/
  '';

-  NIX_CFLAGS_COMPILE = [ "-Wno-parentheses" ];
+  env.NIX_CFLAGS_COMPILE = "-Wno-parentheses";

  dontInstall = true; # Installation already happens as part of "build.sh"

--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -23,7 +23,7 @@ in mkDerivation rec {

  propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ];

-  NIX_LDFLAGS = "-ltag";
+  env.NIX_LDFLAGS = "-ltag";

  meta = with lib; {
    description = "A powerful batch renamer for KDE";
--- a/pkgs/applications/misc/lsd2dsl/default.nix
+++ b/pkgs/applications/misc/lsd2dsl/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {

  buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ];

-  NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces";

  installPhase = ''
    install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -111,7 +111,7 @@ in buildPythonApplication rec {
  # avoid double wrapping
  dontWrapGApps = true;
  makeWrapperArgs = [
-    "--prefix PATH : ${binPath}"
+    "--prefix" "PATH" ":" binPath
    "\${gappsWrapperArgs[@]}"
  ];
  # needed for glib-schemas to work correctly (will crash on dialogues otherwise)
--- a/Show More
+++ b/Show More