public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into cross-nixos

Browse Source
This commit is contained in:
Shea Levy 2018-02-28 19:23:31 -05:00
commit f66da15715
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch
View File

@ -1,10 +1,8 @@
Partially reverts <https://codereview.qt-project.org/#/c/140954/>. diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index e6a0d97f1a..b50ce77d51 100644
diff --git i/mkspecs/features/qt_module.prf w/mkspecs/features/qt_module.prf --- a/mkspecs/features/qt_module.prf
index bb28af97..36bb6483 100644 +++ b/mkspecs/features/qt_module.prf
--- i/mkspecs/features/qt_module.prf @@ -266,7 +266,7 @@ load(qt_installs)
+++ w/mkspecs/features/qt_module.prf
@@ -245,7 +245,7 @@ load(qt_installs)
load(qt_targets) load(qt_targets)
# this builds on top of qt_common # this builds on top of qt_common
@ -13,3 +11,17 @@ index bb28af97..36bb6483 100644
CONFIG += create_pc CONFIG += create_pc
QMAKE_PKGCONFIG_DESTDIR = pkgconfig 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()

4
pkgs/tools/text/gawk/default.nix
View File

@ -19,11 +19,11 @@ let
inherit (stdenv.lib) optional; inherit (stdenv.lib) optional;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gawk-4.2.0"; name = "gawk-4.2.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gawk/${name}.tar.xz"; 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. # When we do build separate interactive version, it makes sense to always include man.

4
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -161,7 +161,7 @@ inherit (core-big) metafont metapost luatex xetex;
core-big = stdenv.mkDerivation { #TODO: upmendex core-big = stdenv.mkDerivation { #TODO: upmendex
name = "texlive-core-big.bin-${version}"; name = "texlive-core-big.bin-${version}";
inherit (common) src patches; inherit (common) src;
hardeningDisable = [ "format" ]; 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 # 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 = ":"; configureScript = ":";