NixOS · Apr 17, 2020 · Apr 17, 2020 · Apr 17, 2020 · Apr 17, 2020 · Apr 17, 2020
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
@@ -121,7 +121,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

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules";
+  env.PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules";
 
   meta = with stdenv.lib; {
     homepage = "https://wiki.gnome.org/Apps/Evolution";

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   prePatch = ''
     substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \
       --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas}
-    patches="$patches $PWD/hardcode-gsettings.patch"
+    patches+=("$PWD/hardcode-gsettings.patch")
   '';
 
   nativeBuildInputs = [

diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   ];
 
   preConfigure = ''
-    configureFlags="$configureFlags --with-config-file=$out/etc/GNUstep/GNUstep.conf"
+    configureFlags+=("--with-config-file=$out/etc/GNUstep/GNUstep.conf")
   '';
 
   makeFlags = [

diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -16,9 +16,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake python3 llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
-  NIX_CFLAGS_COMPILE = [
-    "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
-  ];
+  env.NIX_CFLAGS_COMPILE = "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0";
 
   cmakeFlags = [
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
@@ -52,7 +52,7 @@
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
 
   # don't have "libgcc_s.so.1" on darwin
-  LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+  env.LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
   configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ]
     ++ stdenv.lib.optionals stdenv.isSunOS [

diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     "LIBDIR=${placeholder "out"}/lib"
   ];
 
-  NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft";
+  env.NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft";
 
   meta = with stdenv.lib; {
     description = "A C++ library of functions for DSP and Music Informatics purposes";

diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
@@ -20,7 +20,7 @@ mkDerivation {
     ./0003-kdeinit-extra-libs.patch
     ./0004-start_kdeinit-environ-hard-limit.patch
   ];
-  CXXFLAGS = [
+  env.CXXFLAGS = toString [
     ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"''
     ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"''
     ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"''

diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [ "--without-conf" "--enable-tests=no" ];
-  CXXFLAGS = [
+  env.CXXFLAGS = toString [
     "-Wno-unused-but-set-variable"
     # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
     "-DU_USING_ICU_NAMESPACE=1"

diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
diff --git a/pkgs/tools/networking/p2p/azureus/builder.sh b/pkgs/tools/networking/p2p/azureus/builder.sh
diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix
@@ -2,13 +2,33 @@
 
 stdenv.mkDerivation {
   name = "azureus-2.3.0.6";
-  builder = ./builder.sh;
+
   src = fetchurl {
     url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar";
     sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd";
   };
-#  buildInputs = [unzip];
-  inherit jdk swt;
+
+  dontUnpack = true;
+
+  installPhase = ''
+    mkdir -p $out/jars
+    cp $src $out/jars/azureus.jar
+
+    mkdir -p $out/bin
+    cat > $out/bin/azureus <<EOF
+    #! $SHELL -e
+    azureusHome=$out
+    if test -n "\$HOME"; then
+        azureusHome=\$HOME/.Azureus
+    fi
+    exec ${jdk}/bin/java -Xms16m -Xmx128m \
+      -cp $out/jars/azureus.jar:${swt}/jars/swt.jar \
+      -Djava.library.path=$swt/lib \
+      -Dazureus.install.path=\$azureusHome \
+      org.gudy.azureus2.ui.swt.Main
+    EOF
+    chmod +x $out/bin/azureus
+  '';
 
   meta = {
     platforms = stdenv.lib.platforms.linux;

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -287,7 +287,7 @@ dvisvgm = stdenv.mkDerivation {
 
   # configure script has a bug: it refers to $HAVE_LIBGS but sets $have_libgs
   # TODO: remove for texlive 2020?
-  HAVE_LIBGS = 1;
+  env.HAVE_LIBGS = 1;
 
   configureFlags = common.configureFlags
     ++ [ "--with-system-kpathsea" ];