NixOS · Apr 27, 2021 · Apr 27, 2021 · Apr 27, 2021 · Apr 27, 2021 · Apr 27, 2021
diff --git 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";

diff --git 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";

diff --git 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";
+  env.LIBCLANG_PATH = "${llvmPackages.libclang}/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

diff --git 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";
-
-  configureFlags = [
-    "--enable-libusb"
-  ];
+  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";
 
-  hardeningDisable = [
-    "format"
-  ];
+  configureFlags = [ "--enable-libusb" ];
+
+  hardeningDisable = [ "format" ];
 
-  qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : $out/lib" ];
+  qtWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" "$out/lib" ];
 
   postInstall = ''
     mkdir -p "$out/lib"

diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
@@ -25,12 +25,11 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildFlagsArray = [
-    "-ldflags="
-    "-s"
-    "-w"
-    "-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01"
-    "-X code.cloudfoundry.org/cli/version.binaryVersion=${version}"
+  buildFlags = [
+    ("-ldflags=-s"
+      + " -w"
+      + " -X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01"
+      + " -X code.cloudfoundry.org/cli/version.binaryVersion=${version}")
   ];
 
   postInstall = ''

diff --git a/pkgs/applications/version-management/commitizen/node-composition.nix b/pkgs/applications/version-management/commitizen/node-composition.nix
@@ -5,9 +5,9 @@
   }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
 
 let
-  nodeEnv = import ./node-env.nix {
-    inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+  nodeEnv = import ../../../development/node-packages/node-env.nix {
+    inherit (pkgs) lib stdenv python2 runCommand writeTextFile jq;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in