NixOS · Apr 4, 2020 · Apr 4, 2020 · Apr 4, 2020 · Apr 4, 2020 · Apr 4, 2020
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -1,11 +1,10 @@
-{ runCommand, lib, fontconfig, fontDirectories }:
+{ runCommand, lib, fontconfig, jq, fontDirectories }:
 
 runCommand "fc-cache"
   {
-    nativeBuildInputs = [ fontconfig.bin ];
+    nativeBuildInputs = [ fontconfig.bin jq ];
     preferLocalBuild = true;
     allowSubstitutes = false;
-    passAsFile = [ "fontDirs" ];
     fontDirs = ''
       <!-- Font directories -->
       ${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") fontDirectories)}
@@ -21,7 +20,7 @@ runCommand "fc-cache"
       <include>${fontconfig.out}/etc/fonts/fonts.conf</include>
       <cachedir>$out</cachedir>
     EOF
-    cat "$fontDirsPath" >> fonts.conf
+    <.attrs.json jq .fontDirs >> fonts.conf
     echo "</fontconfig>" >> fonts.conf
 
     mkdir -p $out

diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
@@ -19,17 +19,19 @@ toPerlModule(stdenv.mkDerivation (
 
     checkTarget = "test";
 
-    # Prevent CPAN downloads.
-    PERL_AUTOINSTALL = "--skipdeps";
-
-    # From http://wiki.cpantesters.org/wiki/CPANAuthorNotes: "allows
-    # authors to skip certain tests (or include certain tests) when
-    # the results are not being monitored by a human being."
-    AUTOMATED_TESTING = true;
-
-    # current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it
-    # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC
-    PERL_USE_UNSAFE_INC = "1";
+    env = {
+      # Prevent CPAN downloads.
+      PERL_AUTOINSTALL = "--skipdeps";
+
+      # From http://wiki.cpantesters.org/wiki/CPANAuthorNotes: "allows
+      # authors to skip certain tests (or include certain tests) when
+      # the results are not being monitored by a human being."
+      AUTOMATED_TESTING = true;
+
+      # current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it
+      # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC
+      PERL_USE_UNSAFE_INC = "1";
+    };
 
     meta.homepage = "https://metacpan.org/release/${lib.getName attrs}"; # TODO: phase-out `attrs.name`
     meta.platforms = perl.meta.platforms;

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -375,14 +375,9 @@ in
   nokogiri = attrs: {
     buildFlags = [
       "--use-system-libraries"
-      "--with-zlib-dir=${zlib.dev}"
-      "--with-xml2-lib=${libxml2.out}/lib"
-      "--with-xml2-include=${libxml2.dev}/include/libxml2"
-      "--with-xslt-lib=${libxslt.out}/lib"
-      "--with-xslt-include=${libxslt.dev}/include"
-      "--with-exslt-lib=${libxslt.out}/lib"
-      "--with-exslt-include=${libxslt.dev}/include"
     ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ zlib libxml2 libxslt ];
   };
 
   opus-ruby = attrs: {

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
@@ -1,6 +1,7 @@
 { buildPackages
 , callPackage
 , perl
+, jq
 , bison ? null
 , flex ? null
 , gmp ? null
@@ -96,20 +97,21 @@ let
     pname = "linux-config";
     inherit version;
 
-    generateConfig = ./generate-config.pl;
-
-    kernelConfig = kernelConfigFun intermediateNixConfig;
-    passAsFile = [ "kernelConfig" ];
 
     depsBuildBuild = [ buildPackages.stdenv.cc ];
-    nativeBuildInputs = [ perl gmp libmpc mpfr ]
+    nativeBuildInputs = [ perl gmp libmpc mpfr jq ]
       ++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ];
 
-    platformName = stdenv.hostPlatform.platform.name;
-    # e.g. "defconfig"
-    kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.platform.kernelBaseConfig;
-    # e.g. "bzImage"
-    kernelTarget = stdenv.hostPlatform.platform.kernelTarget;
+    kernelConfig = "${kernelConfigFun intermediateNixConfig}";
+
+    env = {
+      generateConfig = "${./generate-config.pl}";
+      platformName = stdenv.hostPlatform.platform.name;
+      # e.g. "defconfig"
+      kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.platform.kernelBaseConfig;
+      # e.g. "bzImage"
+      kernelTarget = stdenv.hostPlatform.platform.kernelTarget;
+    };
 
     prePatch = kernel.prePatch + ''
       # Patch kconfig to print "###" after every question so that
@@ -132,7 +134,7 @@ let
 
       # Create the config file.
       echo "generating kernel configuration..."
-      ln -s "$kernelConfigPath" "$buildRoot/kernel-config"
+      jq -r <../.attrs.json '.kernelConfig' > "$buildRoot/kernel-config"
       DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \
            PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig
     '';

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
@@ -45,8 +45,15 @@ stdenv.mkDerivation rec {
       #undef _PATH_MV
       #define _PATH_MV "${coreutils}/bin/mv"
     EOF
-    makeFlags="install_uid=$(id -u) install_gid=$(id -g)"
-    installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/"
+    makeFlagsArray+=("install_uid=$(id -u)" "install_gid=$(id -g)")
+    installFlagsArray+=(
+      "sudoers_uid=$(id -u)"
+      "sudoers_gid=$(id -g)"
+      "sysconfdir=$out/etc"
+      "rundir=$TMPDIR/dummy"
+      "vardir=$TMPDIR/dummy"
+      "DESTDIR=/"
+    )
     '';
 
   nativeBuildInputs = [ groff ];