NixOS · Apr 12, 2020 · Apr 12, 2020 · Apr 12, 2020 · Apr 12, 2020 · Apr 12, 2020
diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix
@@ -18,7 +18,7 @@ buildPythonApplication rec {
   propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests
                             requests_toolbelt sqlalchemy ];
 
-  makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ];
+  makeWrapperArgs = [ "--prefix" "LIBFUSE_PATH" ":" "${fuse}/lib/libfuse.so" ];
 
   postFixup = ''
     function lnOverBin() {

diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
@@ -139,7 +139,6 @@ stdenv.mkDerivation rec {
   configureFlags = with stdenv.lib; [
     "--enable-freetype"
     (if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig")
-    (if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl")
     (if xineramaSupport then "--enable-xinerama" else "--disable-xinerama")
     (if xvSupport then "--enable-xv" else "--disable-xv")
     (if alsaSupport then "--enable-alsa" else "--disable-alsa")
@@ -150,21 +149,22 @@ stdenv.mkDerivation rec {
     (if bluraySupport then "--enable-bluray" else "--disable-bluray")
     (if amrSupport then "--enable-libopencore_amrnb" else "--disable-libopencore_amrnb")
     (if cacaSupport then "--enable-caca" else "--disable-caca")
-    (if lameSupport then "--enable-mp3lame --disable-mp3lame-lavc" else "--disable-mp3lame --enable-mp3lame-lavc")
     (if speexSupport then "--enable-speex" else "--disable-speex")
     (if theoraSupport then "--enable-theora" else "--disable-theora")
-    (if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc")
     (if jackaudioSupport then "" else "--disable-jack")
     (if pulseSupport then "--enable-pulse" else "--disable-pulse")
     "--disable-xanim"
     "--disable-ivtv"
-    "--disable-xvid --disable-xvid-lavc"
+    "--disable-xvid" "--disable-xvid-lavc"
     "--disable-ossaudio"
     "--disable-ffmpeg_a"
     "--yasm=${buildPackages.yasm}/bin/yasm"
     # Note, the `target` vs `host` confusion is intensional.
     "--target=${stdenv.hostPlatform.config}"
-  ] ++ optional
+  ] ++ (if x11Support then [ "--enable-x11" "--enable-gl" ] else [ "--disable-x11" "--disable-gl" ])
+    ++ (if lameSupport then [ "--enable-mp3lame" "--disable-mp3lame-lavc" ] else [ "--disable-mp3lame" "--enable-mp3lame-lavc" ])
+    ++ (if x264Support then [ "--enable-x264" "--disable-x264-lavc" ] else [ "--disable-x264" "--enable-x264-lavc" ])
+    ++ optional
          (useUnfreeCodecs && codecs != null && !crossBuild)
          "--codecsdir=${codecs}"
     ++ optional

diff --git a/pkgs/build-support/mono-dll-fixer/builder.sh b/pkgs/build-support/mono-dll-fixer/builder.sh
diff --git a/pkgs/build-support/mono-dll-fixer/default.nix b/pkgs/build-support/mono-dll-fixer/default.nix
@@ -1,8 +1,15 @@
-{stdenv, perl}:
+{ stdenv, perl }:
 
 stdenv.mkDerivation {
   name = "mono-dll-fixer";
-  builder = ./builder.sh;
-  dllFixer = ./dll-fixer.pl;
-  inherit perl;
+
+  src = ./dll-fixer.pl;
+  dontUnpack = true;
+
+  buildInputs = [ perl ];
+
+  installPhase = ''
+    cp $src $out
+    chmod +x $out
+  '';
 }
diff --git a/pkgs/build-support/mono-dll-fixer/dll-fixer.pl b/pkgs/build-support/mono-dll-fixer/dll-fixer.pl
@@ -1,4 +1,4 @@
-#! @perl@ -w
+#!/usr/bin/perl -w
 
 use strict;
 

diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh
diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix
@@ -16,9 +16,22 @@ stdenv.mkDerivation {
       }
     else throw "Not supported on ${stdenv.hostPlatform.system}.";
 
-  builder = ./binary-builder.sh;
+  buildPhase = ''
+    tarballdir=$(pwd)
+    for i in *.tar; do tar xvf $i; done
+  '';
+
+  installPhase = ''
+    mkdir $out
+    cd $out
+    for i in $tarballdir/*.gz; do tar xvf $i; done
+    echo 'Creating ppc* symlink..'
+    for i in $out/lib/fpc/*/ppc*; do
+      ln -fs $i $out/bin/$(basename $i)
+    done
+  '';
 
   meta = {
     description = "Free Pascal Compiler from a binary distribution";
   };
-} 
+}
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -45,7 +45,10 @@ let
 
       dontAddPrefix = true;
 
-      preBuild = "makeFlagsArray=(dictdir=$out/lib/aspell datadir=$out/lib/aspell)";
+      makeFlags = [
+        "dictdir=${placeholder "out"}/lib/aspell"
+        "datadir=${placeholder "out"}/lib/aspell"
+      ];
 
       meta = {
         description = "Aspell dictionary for ${fullName}";
@@ -108,6 +111,8 @@ let
   buildTxtDict =
     {langInputs ? [], ...}@args:
     buildDict ({
+      dontUnpack = true;
+
       propagatedUserEnvPackages = langInputs;
 
       preBuild = ''
@@ -152,8 +157,6 @@ let
           done
         }
       '';
-
-      phases = [ "preBuild" "buildPhase" "installPhase" ];
     } // args);
 
 in rec {
@@ -905,7 +908,11 @@ in rec {
 
     langInputs = [ en ];
 
-    buildPhase = "cat $src | aspell-affix en-computers --dont-validate-words --lang=en";
+    buildPhase = ''
+      runHook preBuild
+      cat $src | aspell-affix en-computers --dont-validate-words --lang=en
+      runHook postBuild
+    '';
     installPhase = "aspell-install en-computers";
 
     meta = {
@@ -930,8 +937,10 @@ in rec {
     langInputs = [ en ];
 
     buildPhase = ''
+      runHook preBuild
       cat $src1 | aspell-plain en_US-science --dont-validate-words --lang=en
       cat $src2 | aspell-plain en_GB-science --dont-validate-words --lang=en
+      runHook postBuild
     '';
     installPhase = "aspell-install en_US-science en_GB-science";
 

diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh
@@ -1,3 +1,5 @@
+source .attrs.sh
+
 source $stdenv/setup
 
 genericBuild

diff --git a/pkgs/development/libraries/java/httpunit/builder.sh b/pkgs/development/libraries/java/httpunit/builder.sh
diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix
@@ -1,15 +1,19 @@
-{stdenv, fetchurl, unzip} :
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "httpunit-1.7";
-  builder = ./builder.sh;
 
   src = fetchurl {
     url = mirror://sourceforge/httpunit/httpunit-1.7.zip;
     sha256 = "09gnayqgizd8cjqayvdpkxrc69ipyxawc96aznfrgdhdiwv8l5zf";
   };
 
-  inherit unzip;
+  nativeBuildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir $out
+    cp -rv * $out/
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://httpunit.sourceforge.net;

diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     unzip ${src}
   '';
 
-  makeFlags = [ "-f" "makefile.u" ];
+  makeFlags = [ "-f makefile.u" ];
 
   installPhase = ''
     mkdir -p $out/include $out/lib

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -135,7 +135,7 @@ EOF
 
   qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64
     then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs"
-    else optional enableProprietaryCodecs "-- -proprietary-codecs";
+    else optionals enableProprietaryCodecs [ "--" "-proprietary-codecs" ];
 
   propagatedBuildInputs = [
     # Image formats

diff --git a/pkgs/development/perl-modules/Mozilla-LDAP/default.nix b/pkgs/development/perl-modules/Mozilla-LDAP/default.nix
@@ -3,13 +3,16 @@
 buildPerlPackage rec {
   pname = "Mozilla-Ldap";
   version = "1.5.3";
-  USE_OPENLDAP = 1;
-  LDAPSDKDIR = openldap.dev;
-  LDAPSDKLIBDIR = "${openldap.out}/lib";
+
   src = fetchurl {
     url = "https://ftp.mozilla.org/pub/directory/perldap/releases/${version}/src/perl-mozldap-${version}.tar.gz";
     sha256 = "0s0albdw0zvg3w37s7is7gddr4mqwicjxxsy400n1p96l7ipnw4x";
   };
+
+  env.USE_OPENLDAP = 1;
+  env.LDAPSDKDIR = toString openldap.dev;
+  env.LDAPSDKLIBDIR = "${openldap.out}/lib";
+
   meta = {
     description = "Mozilla's ldap client library";
     homepage = "https://metacpan.org/release/perldap";

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
@@ -47,7 +47,6 @@ let
         rev = rev-manual;
         sha256 = sha256-manual;
       };
-      phases = [ "unpackPhase" "patchPhase" "buildPhase" ];
       nativeBuildInputs = [ asciidoc ];
       patchPhase = ''
         # rsync isnt needed
@@ -67,6 +66,7 @@ let
             -i *.txt
         mkdir -p $out/share/doc/anki/html
       '';
+      dontInstall = true; # happens in buildPhase
     };
 
 in
@@ -91,13 +91,13 @@ buildPythonApplication rec {
       markdown jsonschema setuptools
     ]
       ++ lib.optional plotsSupport matplotlib
-      ++ lib.optional stdenv.isDarwin [ CoreAudio ]
+      ++ lib.optional stdenv.isDarwin CoreAudio
       ;
 
     checkInputs = [ pytest glibcLocales nose ];
 
     nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
-    buildInputs = [ lame mplayer libpulseaudio  ];
+    buildInputs = [ lame mplayer libpulseaudio ];
 
     patches = [
       # Disable updated version check.

diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix
@@ -1,8 +1,10 @@
 { stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo,
   libpng, libtool, libxml2, pkgconfig, which, xorg }:
+
 stdenv.mkDerivation rec {
   pname = "nx-libs";
   version = "3.5.99.23";
+
   src = fetchFromGitHub {
     owner = "ArcticaProject";
     repo = "nx-libs";
@@ -25,12 +27,12 @@ stdenv.mkDerivation rec {
     ln -s libNX_X11.so.6.3.0
   '';
 
-  PREFIX=""; # Don't install to $out/usr/local
-  installPhase = ''
-    make DESTDIR="$out" install
-    # See:
-    # - https://salsa.debian.org/debian-remote-team/nx-libs/blob/bcc152100617dc59156015a36603a15db530a64f/debian/rules#L66-72
-    # - https://github.com/ArcticaProject/nx-libs/issues/652
+  installFlags = [ "PREFIX=" "DESTDIR=${placeholder "out"}" ];
+
+  # See:
+  # - https://salsa.debian.org/debian-remote-team/nx-libs/blob/bcc152100617dc59156015a36603a15db530a64f/debian/rules#L66-72
+  # - https://github.com/ArcticaProject/nx-libs/issues/652
+  postFixup = ''
     patchelf --remove-needed "libX11.so.6" $out/bin/nxagent
   '';