Merge branch 'staging' (older version)

This just adds some fixups, not any mass rebuild.

Changed files
+30 -15
pkgs
desktops
gnome-3
3.22
core
caribou
development
compilers
gcc
libraries
top-level
+6 -7
pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
···
-
{ fetchurl, stdenv, autoreconfHook, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf
-
, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake }:
+
{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
+
, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook }:
let
majorVersion = "0.4";
···
sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
};
+
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = with gnome3;
-
[ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake
-
pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ];
-
-
nativeBuildInputs = [ autoreconfHook ];
+
[ glib gtk clutter at_spi2_core dbus pythonPackages.python
+
pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ];
propagatedBuildInputs = [ gnome3.libgee libxklavier ];
-
preBuild = ''
+
postPatch = ''
patchShebangs .
substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0"
'';
+10 -3
pkgs/development/compilers/gcc/4.8/default.nix
···
-
{ stdenv, fetchurl, noSysDirs
+
{ stdenv, fetchurl, fetchpatch, noSysDirs
, langC ? true, langCC ? true, langFortran ? false
, langObjC ? targetPlatform.isDarwin
, langObjCpp ? targetPlatform.isDarwin
···
# target libraries and tools.
++ optional langAda ../gnat-cflags.patch
++ optional langFortran ../gfortran-driving.patch
-
++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch;
+
++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch
+
++ [(fetchpatch {
+
name = "libc_name_p.diff"; # needed to build with gcc6
+
url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f1";
+
sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl";
+
excludes = [ "gcc/cp/ChangeLog" ];
+
})]
+
;
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
···
hardeningDisable = [ "format" ];
-
outputs = [ "out" "lib" "doc" ];
+
outputs = [ "out" "lib" "man" "info" ];
setOutputFlags = false;
NIX_NO_SELF_RPATH = true;
+1 -2
pkgs/development/compilers/gcc/4.9/default.nix
···
# target libraries and tools.
++ optional langAda ../gnat-cflags.patch
++ optional langFortran ../gfortran-driving.patch
-
# The NXConstStr.patch can be removed at 4.9.4
-
++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch;
+
;
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
+7 -3
pkgs/development/libraries/fftw/default.nix
···
assert elem precision [ "single" "double" "long-double" "quad-precision" ];
-
let version = "3.3.6-pl1"; in
+
let
+
version = "3.3.6-pl1";
+
withDoc = stdenv.cc.isGNU;
+
in
stdenv.mkDerivation rec {
name = "fftw-${precision}-${version}";
···
sha256 = "0g8qk98lgq770ixdf7n36yd5xjsgm2v3wzvnphwmhy6r4y2amx0y";
};
-
outputs = [ "out" "dev" "man" "info" ]; # it's dev-doc only
+
outputs = [ "out" "dev" "man" ]
+
++ optional withDoc "info"; # it's dev-doc only
outputBin = "dev"; # fftw-wisdom
configureFlags =
···
++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2"
++ optional stdenv.cc.isGNU "--enable-openmp"
# doc generation causes Fortran wrapper generation which hard-codes gcc
-
++ optional (!stdenv.cc.isGNU) "--disable-doc";
+
++ optional (!withDoc) "--disable-doc";
enableParallelBuilding = true;
+6
pkgs/top-level/all-packages.nix
···
apt = callPackage ../tools/package-management/apt {
inherit (perlPackages) Po4a;
+
# include/c++/6.4.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
+
stdenv = overrideCC stdenv gcc5;
};
autorevision = callPackage ../tools/misc/autorevision { };
···
harfbuzz = harfbuzz.override {
withIcu = true; withGraphite2 = true;
+
# checking whether g++ supports C++14 or C++11... configure: error: no
+
stdenv = overrideCC stdenv gcc5;
});
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix {
···
harfbuzz = harfbuzz.override {
withIcu = true; withGraphite2 = true;
+
# checking whether g++ supports C++14 or C++11... configure: error: no
+
stdenv = overrideCC stdenv gcc5;
});