Merge branch 'staging' into glibc-2.27

NixOS · Mar 1, 2018 · 47bf559 · 47bf559
2 parents f50d0f1 + 1ad37a8
commit 47bf559
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch
@@ -1,15 +1,27 @@
-Partially reverts <https://codereview.qt-project.org/#/c/140954/>.
-
-diff --git i/mkspecs/features/qt_module.prf w/mkspecs/features/qt_module.prf
-index bb28af97..36bb6483 100644
---- i/mkspecs/features/qt_module.prf
-+++ w/mkspecs/features/qt_module.prf
-@@ -245,7 +245,7 @@ load(qt_installs)
+diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
+index e6a0d97f1a..b50ce77d51 100644
+--- a/mkspecs/features/qt_module.prf
++++ b/mkspecs/features/qt_module.prf
+@@ -266,7 +266,7 @@ load(qt_installs)
  load(qt_targets)
-
+ 
  # this builds on top of qt_common
 -!internal_module:!lib_bundle:if(unix|mingw) {
 +!internal_module:if(unix|mingw) {
      CONFIG += create_pc
      QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-     host_build: \
+     host_build: \
+diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
+index 62b88c6fe2..f302f1e202 100644
+--- a/mkspecs/features/qt_module_headers.prf
++++ b/mkspecs/features/qt_module_headers.prf
+@@ -102,8 +102,7 @@ git_build: \
+ else: \
+     INC_PATH = $$MODULE_BASE_INDIR
+ include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true)
+-!lib_bundle: \  # Headers are embedded into the bundle, so don't install them separately.
+-    CONFIG += qt_install_headers
++CONFIG += qt_install_headers
+
+ alien_syncqt: return()
+
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
@@ -19,11 +19,11 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  name = "gawk-4.2.0";
+  name = "gawk-4.2.1";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/${name}.tar.xz";
-    sha256 = "1wm9lqj77y7xz07zi0n187aqm8zavzxzpm1j53ahxz81q0qwvwyl";
+    sha256 = "0lam2zf3n7ak4pig8w46lhx9hzx50kj2v2yj1616mm26wy2rf4fi";
   };
 
   # When we do build separate interactive version, it makes sense to always include man.

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -161,7 +161,7 @@ inherit (core-big) metafont metapost luatex xetex;
 core-big = stdenv.mkDerivation { #TODO: upmendex
   name = "texlive-core-big.bin-${version}";
 
-  inherit (common) src patches;
+  inherit (common) src;
 
   hardeningDisable = [ "format" ];
 
@@ -176,7 +176,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
         # http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex
       ];
 
-  patches = [ ./luatex-gcc7.patch ];
+  patches = common.patches ++ [ ./luatex-gcc7.patch ];
 
   configureScript = ":";