Merge branch 'master' into staging

Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
parent 4eec6bc9c9 ddddca5c2f
commit 7079e744d4
927 changed files with 18154 additions and 12101 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, elfutils, mesa_noglu
+{ stdenv, fetchurl, elfutils, libGL
 , xorg, patchelf, openssl, libdrm, libudev
 , libxcb, libxshmfence, epoxy, perl, zlib
 , fetchFromGitHub, ncurses
@@ -13,7 +13,7 @@ let

  kernelDir = if libsOnly then null else kernel.dev;

-  inherit (mesa_noglu) driverLink;
+  inherit (libGL) driverLink;

  bitness = if stdenv.is64bit then "64" else "32";

@@ -246,9 +246,9 @@ if test -z "$libsOnly"; then
  ( # build and install fgl_glxgears
    cd fgl_glxgears;
    gcc -DGL_ARB_texture_multisample=1 -g \
-    -I$mesa/include \
+    -I$libGLU_combined/include \
    -I$out/include \
-    -L$mesa/lib -lGL -lGLU -lX11 -lm \
+    -L$libGLU_combined/lib -lGL -lGLU -lX11 -lm \
    -o $out/bin/fgl_glxgears -Wall fgl_glxgears.c
  )

@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, kernel ? null, which
 , xorg, makeWrapper, glibc, patchelf, unzip
-, fontconfig, freetype, mesa # for fgl_glxgears
+, fontconfig, freetype, libGLU_combined # for fgl_glxgears
 , # Whether to build the libraries only (i.e. not the kernel module or
  # driver utils). Used to support 32-bit binaries on 64-bit
  # Linux.
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
      xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE
      patchelf
      unzip
-      mesa
+      libGLU_combined
      fontconfig
      freetype
      makeWrapper
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
  LD_LIBRARY_PATH = makeLibraryPath
    [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
      xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE
-      mesa
+      libGLU_combined
      fontconfig
      freetype
      stdenv.cc.cc
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
                   xorg.libX11.out xorg.libXinerama.out xorg.libSM.out
                   xorg.libICE.out ];

-  inherit mesa; # only required to build the examples
+  inherit libGLU_combined; # only required to build the examples

  enableParallelBuilding = true;

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:

 let
-  ver = "2017.4";
+  ver = "2018.0";
 in
 stdenv.mkDerivation rec {
  name = "alfred-${ver}";

  src = fetchurl {
    url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "126wfmng4x19k8n4930v03qbjhwrikq9bvhl7mlng1k2fpx1msn4";
+    sha256 = "0mzjgjkmgdrrqa6fbpii9q1xqvg3kvwgq2k2kpdf0vy4xxnypky7";
  };

  nativeBuildInputs = [ pkgconfig ];
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libnl }:

 let
-  ver = "2017.4";
+  ver = "2018.0";
 in
 stdenv.mkDerivation rec {
  name = "batctl-${ver}";

  src = fetchurl {
    url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "0r742krc9mn677wmfwbhwhqq9739n74vpw0xfasvy7d59nn6lz84";
+    sha256 = "1x7gy6agwk68s2cbhc4wfhvhdy2ccrq0vi7jzaj94pn8nqshi5ss";
  };

  nativeBuildInputs = [ pkgconfig ];
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, kernel }:

-let base = "batman-adv-2017.4"; in
+let base = "batman-adv-2018.0"; in

 stdenv.mkDerivation rec {
  name = "${base}-${kernel.version}";

  src = fetchurl {
    url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
-    sha256 = "0k4sf52sbk39m25w6plk8spwcf4kzc3axckyk2r6anxxsangyl4a";
+    sha256 = "0v2pyy9lxyy71nr9600k9935qcpn2wpyl9fsf2a4m4d2x0wgh9j8";
  };

  nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -50,7 +50,7 @@ stdenv.mkDerivation {

  meta = with stdenv.lib; {
    description = "A module for powering off hybrid GPUs";
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
    homepage = https://github.com/Bumblebee-Project/bbswitch;
    maintainers = with maintainers; [ abbradar ];
  };
@@ -0,0 +1,30 @@
+{ stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre
+, json_c, flex, bison, dtc, pciutils, dmidecode, iasl }:
+
+stdenv.mkDerivation rec {
+  name = "fwts-${version}";
+  version = "18.01.00";
+
+  src = fetchzip {
+    url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
+    sha256 = "043wkq4hz5pz79masppya67b8i5jw61p1j8dw17jwc8w6gp8csfb";
+    stripRoot = false;
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
+  buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl ];
+
+  postPatch = ''
+    substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/lspci"      "${pciutils}/bin/lspci"
+    substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode"
+    substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/iasl"       "${iasl}/bin/iasl"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://wiki.ubuntu.com/FirmwareTestSuite";
+    description = "Firmware Test Suite";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ tadfisher ];
+  };
+}
@@ -1,12 +1,10 @@
-{ buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
+{ buildPackages
 , ncurses
-, libelf
-, utillinux
-, writeTextFile, ubootTools
 , callPackage
-}:
-
-{ stdenv, buildPackages, perl, buildLinux
+, perl
+, bison ? null
+, flex ? null
+, stdenv

 , # The kernel source tarball.
  src
@@ -35,6 +33,12 @@
                       hostPlatform != stdenv.buildPlatform
 , extraMeta ? {}
 , hostPlatform
+
+# easy overrides to hostPlatform.platform members
+, autoModules ? hostPlatform.platform.kernelAutoModules
+, preferBuiltin ? hostPlatform.platform.kernelPreferBuiltin or false
+, kernelArch ? hostPlatform.platform.kernelArch
+
 , ...
 } @ args:

@@ -67,7 +71,7 @@ let
    in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);

  configfile = stdenv.mkDerivation {
-    inherit ignoreConfigErrors;
+    inherit ignoreConfigErrors autoModules preferBuiltin kernelArch;
    name = "linux-config-${version}";

    generateConfig = ./generate-config.pl;
@@ -83,9 +87,6 @@ let
    kernelBaseConfig = hostPlatform.platform.kernelBaseConfig;
    # e.g. "bzImage"
    kernelTarget = hostPlatform.platform.kernelTarget;
-    autoModules = hostPlatform.platform.kernelAutoModules;
-    preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false;
-    arch = hostPlatform.platform.kernelArch;

    prePatch = kernel.prePatch + ''
      # Patch kconfig to print "###" after every question so that
@@ -99,12 +100,12 @@ let
      export buildRoot="''${buildRoot:-build}"

      # Get a basic config file for later refinement with $generateConfig.
-      make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C . O="$buildRoot" $kernelBaseConfig ARCH=$arch
+      make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C . O="$buildRoot" $kernelBaseConfig ARCH=$kernelArch

      # Create the config file.
      echo "generating kernel configuration..."
      echo "$kernelConfig" > "$buildRoot/kernel-config"
-      DEBUG=1 ARCH=$arch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \
+      DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \
           PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig
    '';

@@ -3,13 +3,13 @@
 with stdenv.lib;

 buildLinux (args // rec {
-  version = "4.14.23";
+  version = "4.14.25";

  # branchVersion needs to be x.y
  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1jhjazzaw5m92jl7cbchzfg5fyci7fp285bilydfvaibb9avb5ws";
+    sha256 = "11z544zyq1k1x52a3wibhqgkbjn9vmccxcgd0qdirrb8q1wvzkvd";
  };
 } // (args.argsOverride or {}))
@@ -3,7 +3,7 @@
 with stdenv.lib;

 buildLinux (args // rec {
-  version = "4.15.7";
+  version = "4.15.8";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1in8gy82ccpri7xhbgim3jrh15lbfrfzjgg69g0yvq534d5xyi6d";
+    sha256 = "0nk0k6gywlvy88y0nvy55l5ivnrqs5c3r36rlrrpcvfdyz273h4a";
  };
 } // (args.argsOverride or {}))
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

 buildLinux (args // rec {
-  version = "4.4.119";
+  version = "4.4.120";
  extraMeta.branch = "4.4";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1rj3hk31bx9nvpx0dmwiijyixiv0dcxvp2cx4fbkbs9fddxrn7sg";
+    sha256 = "0y7li4vcvv04aqkrgl01i98pgwm9njzrb8y8wdvwaq9658vhfpx2";
  };
 } // (args.argsOverride or {}))
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

 buildLinux (args // rec {
-  version = "4.9.85";
+  version = "4.9.86";
  extraMeta.branch = "4.9";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1hb5v5ycgg5wbv28s8vxw804blfshpf82chrwspdbl2vwkp17zl0";
+    sha256 = "11bf1jcxn5gwd1g99ml2kn65vkpciq8hdz7xc0bjy66gxysnxkx7";
  };
 } // (args.argsOverride or {}))
@@ -3,9 +3,9 @@
 with stdenv.lib;

 let
-  version = "4.15.7";
+  version = "4.15.8";
  revision = "a";
-  sha256 = "19kgy1fa4flnqm3a50hilgjczqkscay10183cvkzy3vxrnf8fl0f";
+  sha256 = "0bkvg93r1j7shls29yz3zi34lx71i3ylcsdyhdc9plzwb3chnpqg";

  # modVersion needs to be x.y.z, will automatically add .0 if needed
  modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:

 buildLinux (args // rec {
-  version = "4.16-rc1";
-  modDirVersion = "4.16.0-rc1";
+  version = "4.16-rc4";
+  modDirVersion = "4.16.0-rc4";
  extraMeta.branch = "4.16";

  src = fetchurl {
    url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "19m1scqfcslawsxci0lypy32af315by3rg10lczv0jh2j4gyggmd";
+    sha256 = "0fxs3i7rdw5mybmim0npmzqpp7i3ppy1f6f72q2w3qdbjmbqm7w6";
  };

  # Should the testing kernels ever be built on Hydra?
@@ -4,7 +4,7 @@
 , systemd
 , libxkbcommon
 , libdrm
-, mesa
+, libGLU_combined
 , pango
 , pixman
 , pkgconfig
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    systemd
    libxkbcommon
    libdrm
-    mesa
+    libGLU_combined
    pango
    pixman
    pkgconfig
@@ -1,16 +1,16 @@
-{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }:
+{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, pkgconfig }:

 stdenv.mkDerivation rec {
  name = "kmscube-2017-03-19";

  src = fetchgit {
-    url = git://anongit.freedesktop.org/mesa/kmscube;
+    url = git://anongit.freedesktop.org/libGLU_combined/kmscube;
    rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea";
    sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca";
  };

  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ libdrm libX11 mesa_noglu ];
+  buildInputs = [ libdrm libX11 libGL ];

  meta = with stdenv.lib; {
    description = "Example OpenGL app using KMS/GBM";
@@ -2,9 +2,12 @@
 , gawk, utillinux, xorg, glib, dbus-glib, zlib
 , kernel ? null, libsOnly ? false
 , undmg, fetchurl
+, libelf
 }:

 assert (!libsOnly) -> kernel != null;
+# Disable for kernels 4.15 and above due to compatibility issues
+assert kernel != null -> stdenv.lib.versionOlder kernel.version "4.15";

 let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version;
    xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer));
@@ -27,7 +30,7 @@ stdenv.mkDerivation rec {
  hardeningDisable = [ "pic" "format" ];

  # also maybe python2 to generate xorg.conf
-  nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ];
+  nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies;

  inherit libsOnly;

@@ -17,219 +17,214 @@ assert stdenv.isLinux;
 let
  pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);

-in
+in stdenv.mkDerivation rec {
+  version = "237";
+  name = "systemd-${version}";

-  stdenv.mkDerivation rec {
-    version = "237";
-    name = "systemd-${version}";
+  src = fetchFromGitHub {
+    owner = "NixOS";
+    repo = "systemd";
+    rev = "98067cc806ae0d2759cdd2334f230cd8548e5317";
+    sha256 = "077svfs2xy3g30s62q69wcv5pb9vfhzh8i7lhfri73vvhwbpzd5q";
+  };

-    src = fetchFromGitHub {
-      owner = "NixOS";
-      repo = "systemd";
-      rev = "1e8830dfa77a7dc6976509f4a6edb7e012c50792";
-      sha256 = "1cw1k0i68azmzpqzi3r8jm6mbi2wqlql78fhcg0vvnv1ly8bf7vq";
-    };
+  outputs = [ "out" "lib" "man" "dev" ];

-    outputs = [ "out" "lib" "man" "dev" ];
+  nativeBuildInputs =
+    [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
+      ninja meson
+      coreutils # meson calls date, stat etc.
+      glibcLocales
+      patchelf getent m4
+    ];
+  buildInputs =
+    [ linuxHeaders libcap kmod xz pam acl
+      /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
+      libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor
+      iptables gnu-efi
+      # This is actually native, but we already pull it from buildPackages
+      pythonLxmlEnv
+    ];

-    nativeBuildInputs =
-      [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
-        ninja meson
-        coreutils # meson calls date, stat etc.
-        glibcLocales
-        patchelf getent m4
-      ];
-    buildInputs =
-      [ linuxHeaders libcap kmod xz pam acl
-        /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
-        libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor
-        iptables gnu-efi
-        # This is actually native, but we already pull it from buildPackages
-        pythonLxmlEnv
-      ];
+  #dontAddPrefix = true;

-    #dontAddPrefix = true;
+  mesonFlags = [
+    "-Dloadkeys-path=${kbd}/bin/loadkeys"
+    "-Dsetfont-path=${kbd}/bin/setfont"
+    "-Dtty-gid=3" # tty in NixOS has gid 3
+    # "-Dtests=" # TODO
+    "-Dlz4=true"
+    "-Dhostnamed=true"
+    "-Dnetworkd=true"
+    "-Dsysusers=false"
+    "-Dtimedated=true"
+    "-Dtimesyncd=true"
+    "-Dfirstboot=false"
+    "-Dlocaled=true"
+    "-Dresolve=true"
+    "-Dsplit-usr=false"
+    "-Dlibcurl=false"
+    "-Dlibidn=false"
+    "-Dlibidn2=true"
+    "-Dquotacheck=false"
+    "-Dldconfig=false"
+    "-Dsmack=true"
+    "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work
+    "-Dsystem-gid-max=499"
+    # "-Dtime-epoch=1"

-    mesonFlags = [
-      "-Dloadkeys-path=${kbd}/bin/loadkeys"
-      "-Dsetfont-path=${kbd}/bin/setfont"
-      "-Dtty-gid=3" # tty in NixOS has gid 3
-      # "-Dtests=" # TODO
-      "-Dlz4=true"
-      "-Dhostnamed=true"
-      "-Dnetworkd=true"
-      "-Dsysusers=false"
-      "-Dtimedated=true"
-      "-Dtimesyncd=true"
-      "-Dfirstboot=false"
-      "-Dlocaled=true"
-      "-Dresolve=true"
-      "-Dsplit-usr=false"
-      "-Dlibcurl=false"
-      "-Dlibidn=false"
-      "-Dlibidn2=true"
-      "-Dquotacheck=false"
-      "-Dldconfig=false"
-      "-Dsmack=true"
-      "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work
-      "-Dsystem-gid-max=499"
-  #    "-Dtime-epoch=1"
+    (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
+    "-Defi-libdir=${toString gnu-efi}/lib"
+    "-Defi-includedir=${toString gnu-efi}/include/efi"
+    "-Defi-ldsdir=${toString gnu-efi}/lib"

-      (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
-      "-Defi-libdir=${toString gnu-efi}/lib"
-      "-Defi-includedir=${toString gnu-efi}/include/efi"
-      "-Defi-ldsdir=${toString gnu-efi}/lib"
+    "-Dsysvinit-path="
+    "-Dsysvrcnd-path="

-      "-Dsysvinit-path="
-      "-Dsysvrcnd-path="
+    "-Dkill-path=${coreutils}/bin/kill"
+    "-Dkmod-path=${kmod}/bin/kmod"
+    "-Dsulogin-path=${utillinux}/bin/sulogin"
+    "-Dmount-path=${utillinux}/bin/mount"
+    "-Dumount-path=${utillinux}/bin/umount"
+  ];

-      "-Dkill-path=${coreutils}/bin/kill"
-      "-Dkmod-path=${kmod}/bin/kmod"
-      "-Dsulogin-path=${utillinux}/bin/sulogin"
-      "-Dmount-path=${utillinux}/bin/mount"
-      "-Dumount-path=${utillinux}/bin/umount"
-      ];
+  preConfigure = ''
+    mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
+    mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d)
+    mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services)
+    mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services)
+    mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d)
+    mesonFlagsArray+=(-Drootprefix=$out)
+    mesonFlagsArray+=(-Dlibdir=$lib/lib)
+    mesonFlagsArray+=(-Drootlibdir=$lib/lib)
+    mesonFlagsArray+=(-Dmandir=$man/lib)
+    mesonFlagsArray+=(-Dincludedir=$dev/include)
+    mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig)
+    mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig)

-    preConfigure =
-      ''
-        mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
-        mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d)
-        mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services)
-        mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services)
-        mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d)
-        mesonFlagsArray+=(-Dsysconfdir=$out/etc)
-        mesonFlagsArray+=(-Drootprefix=$out)
-        mesonFlagsArray+=(-Dlibdir=$lib/lib)
-        mesonFlagsArray+=(-Drootlibdir=$lib/lib)
-        mesonFlagsArray+=(-Dmandir=$man/lib)
-        mesonFlagsArray+=(-Dincludedir=$dev/include)
-        mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig)
-        mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig)
+    # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are?
+    substituteInPlace meson.build \
+      --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \
+                "includedir = '$dev/include'" \
+      --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \
+                "libdir = '$lib/lib'"

-        # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are?
-        substituteInPlace meson.build \
-          --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \
-                    "includedir = '$dev/include'" \
-          --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \
-                    "libdir = '$lib/lib'"
+    export LC_ALL="en_US.UTF-8";
+    # FIXME: patch this in systemd properly (and send upstream).
+    # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount
+    for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
+      test -e $i
+      substituteInPlace $i \
+        --replace /usr/bin/getent ${getent}/bin/getent \
+        --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \
+        --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \
+        --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
+        --replace /bin/echo ${coreutils}/bin/echo \
+        --replace /bin/cat ${coreutils}/bin/cat \
+        --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \
+        --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
+        --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
+    done

-        export LC_ALL="en_US.UTF-8";
-        # FIXME: patch this in systemd properly (and send upstream).
-        # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount
-        for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
-          test -e $i
-          substituteInPlace $i \
-            --replace /usr/bin/getent ${getent}/bin/getent \
-            --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \
-            --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \
-            --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
-            --replace /bin/echo ${coreutils}/bin/echo \
-            --replace /bin/cat ${coreutils}/bin/cat \
-            --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \
-            --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
-            --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
-        done
+    for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do
+      substituteInPlace $i \
+        --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python"
+    done

-        for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do
-          substituteInPlace $i \
-            --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python"
-        done
+    for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do
+      substituteInPlace $i \
+        --replace "#!/usr/bin/env python" "#!${buildPackages.python3Packages.python}/bin/python"
+    done

-        for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do
-          substituteInPlace $i \
-            --replace "#!/usr/bin/env python" "#!${buildPackages.python3Packages.python}/bin/python"
-        done
+    substituteInPlace src/journal/catalog.c \
+      --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
+  '';

-        substituteInPlace src/journal/catalog.c \
-          --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
-      '';
+  # These defines are overridden by CFLAGS and would trigger annoying
+  # warning messages
+  postConfigure = ''
+    substituteInPlace config.h \
+      --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \
+      --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \
+      --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
+  '';

-    # These defines are overridden by CFLAGS and would trigger annoying
-    # warning messages
-    postConfigure = ''
-      substituteInPlace config.h \
-        --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \
-        --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \
-        --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
-    '';
+  hardeningDisable = [ "stackprotector" ];

-    hardeningDisable = [ "stackprotector" ];
+  NIX_CFLAGS_COMPILE =
+    [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would
+      # lead to a cyclic dependency.
+      "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""

-    NIX_CFLAGS_COMPILE =
-      [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would
-        # lead to a cyclic dependency.
-        "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
+      # Set the release_agent on /sys/fs/cgroup/systemd to the
+      # currently running systemd (/run/current-system/systemd) so
+      # that we don't use an obsolete/garbage-collected release agent.
+      "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""

-        # Set the release_agent on /sys/fs/cgroup/systemd to the
-        # currently running systemd (/run/current-system/systemd) so
-        # that we don't use an obsolete/garbage-collected release agent.
-        "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""
+      "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
+    ];

-        "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
-      ];
+  postInstall = ''
+    # sysinit.target: Don't depend on
+    # systemd-tmpfiles-setup.service. This interferes with NixOps's
+    # send-keys feature (since sshd.service depends indirectly on
+    # sysinit.target).
+    mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/

-    postInstall =
-      ''
-        # sysinit.target: Don't depend on
-        # systemd-tmpfiles-setup.service. This interferes with NixOps's
-        # send-keys feature (since sshd.service depends indirectly on
-        # sysinit.target).
-        mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/
+    mkdir -p $out/example/systemd
+    mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
+    mv $out/lib/systemd/{system,user} $out/example/systemd

-        mkdir -p $out/example/systemd
-        mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
-        mv $out/lib/systemd/{system,user} $out/example/systemd
+    rm -rf $out/etc/systemd/system

-        rm -rf $out/etc/systemd/system
+    # Install SysV compatibility commands.
+    mkdir -p $out/sbin
+    ln -s $out/lib/systemd/systemd $out/sbin/telinit
+    for i in init halt poweroff runlevel reboot shutdown; do
+      ln -s $out/bin/systemctl $out/sbin/$i
+    done

-        # Install SysV compatibility commands.
-        mkdir -p $out/sbin
-        ln -s $out/lib/systemd/systemd $out/sbin/telinit
-        for i in init halt poweroff runlevel reboot shutdown; do
-          ln -s $out/bin/systemctl $out/sbin/$i
-        done
+    # Fix reference to /bin/false in the D-Bus services.
+    for i in $out/share/dbus-1/system-services/*.service; do
+      substituteInPlace $i --replace /bin/false ${coreutils}/bin/false
+    done

-        # Fix reference to /bin/false in the D-Bus services.
-        for i in $out/share/dbus-1/system-services/*.service; do
-          substituteInPlace $i --replace /bin/false ${coreutils}/bin/false
-        done
+    rm -rf $out/etc/rpm

-        rm -rf $out/etc/rpm
+    # "kernel-install" shouldn't be used on NixOS.
+    find $out -name "*kernel-install*" -exec rm {} \;

-        # "kernel-install" shouldn't be used on NixOS.
-        find $out -name "*kernel-install*" -exec rm {} \;
+    # Keep only libudev and libsystemd in the lib output.
+    mkdir -p $out/lib
+    mv $lib/lib/security $lib/lib/libnss* $out/lib/
+  ''; # */

-        # Keep only libudev and libsystemd in the lib output.
-        mkdir -p $out/lib
-        mv $lib/lib/security $lib/lib/libnss* $out/lib/
-      ''; # */
+  enableParallelBuilding = true;

-    enableParallelBuilding = true;
+  # The rpath to the shared systemd library is not added by meson. The
+  # functionality was removed by a nixpkgs patch because it would overwrite
+  # the existing rpath.
+  postFixup = ''
+    sharedLib=libsystemd-shared-${version}.so
+    for prog in `find $out -type f -executable`; do
+      (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && (
+        patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog
+      ) || true
+    done
+  '';

-    # The rpath to the shared systemd library is not added by meson. The
-    # functionality was removed by a nixpkgs patch because it would overwrite
-    # the existing rpath.
-    postFixup = ''
-      sharedLib=libsystemd-shared-${version}.so
-      for prog in `find $out -type f -executable`; do
-        (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && (
-          patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog
-        ) || true
-      done
-    '';
+  # The interface version prevents NixOS from switching to an
+  # incompatible systemd at runtime.  (Switching across reboots is
+  # fine, of course.)  It should be increased whenever systemd changes
+  # in a backwards-incompatible way.  If the interface version of two
+  # systemd builds is the same, then we can switch between them at
+  # runtime; otherwise we can't and we need to reboot.
+  passthru.interfaceVersion = 2;

-    # The interface version prevents NixOS from switching to an
-    # incompatible systemd at runtime.  (Switching across reboots is
-    # fine, of course.)  It should be increased whenever systemd changes
-    # in a backwards-incompatible way.  If the interface version of two
-    # systemd builds is the same, then we can switch between them at
-    # runtime; otherwise we can't and we need to reboot.
-    passthru.interfaceVersion = 2;
-
-    meta = {
-      homepage = http://www.freedesktop.org/wiki/Software/systemd;
-      description = "A system and service manager for Linux";
-      platforms = stdenv.lib.platforms.linux;
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-    };
+  meta = {
+    homepage = http://www.freedesktop.org/wiki/Software/systemd;
+    description = "A system and service manager for Linux";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+  };
 }
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
    sha256 = "19asyrypjhx2cgjdmwfvmgc0hk3xg00zvgkl89vwxngdb40bkwfq";
  };

+  # Fails on 32-bit otherwise
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
  postPatch = ''
    patchShebangs ./configure
    patchShebangs ./scripts/
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, pkgconfig, perl
 , libjpeg, udev
 , withUtils ? true
-, withGUI ? true, alsaLib, libX11, qtbase, mesa_glu
+, withGUI ? true, alsaLib, libX11, qtbase, libGLU
 }:

 # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT)
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkgconfig perl ];

-  buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ];
+  buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase libGLU ];

  propagatedBuildInputs = [ libjpeg ];