Merge branch 'staging' into staging-next

2019-12-31 03:59:58 +01:00
parent d6136b744a c5406e30b0
commit 0c2adc0fb1
352 changed files with 639 additions and 837 deletions
@@ -40,10 +40,8 @@ stdenv.mkDerivation {
  configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
    ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";

-  preInstall = ''
-    installFlags="TEXMF=$out/texmf-dist";
-    installTargets="install install-tex";
-  '';
+  installFlags = [ "TEXMF=$(out)/texmf-dist" ];
+  installTargets = [ "install" "install-tex" ];

  checkInputs = [ procps ];