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

merge fixup: conflict of gcc->cc and kde5 StdInc

Browse Source 
Tarball builds now, so hopefully all is OK.
This commit is contained in:
Vladimír Čunát 2015-01-31 19:50:11 +01:00
parent dbae4f109f
commit 7d6cd236c3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/build-support/gcc-wrapper/setup-hook-stdinc.sh → pkgs/build-support/cc-wrapper/setup-hook-stdinc.sh
View File

14
pkgs/top-level/all-packages.nix
View File

@ -4135,17 +4135,17 @@ let
* build system so that the Qt 4 components find the Qt 4 headers and the Qt 5
* components find the Qt 5 headers.
*/
wrapGCCStdInc = glibc: baseGCC: (import ../build-support/gcc-wrapper) {
wrapGCCStdInc = glibc: baseGCC: (import ../build-support/cc-wrapper) {
nativeTools = stdenv.cc.nativeTools or false;
nativeLibc = stdenv.cc.nativeLibc or false;
nativePrefix = stdenv.cc.nativePrefix or "";
gcc = baseGCC;
cc = baseGCC;
libc = glibc;
inherit stdenv binutils coreutils zlib;
setupHook = ../build-support/gcc-wrapper/setup-hook-stdinc.sh;
setupHook = ../build-support/cc-wrapper/setup-hook-stdinc.sh;
};
gccStdInc = wrapGCCStdInc glibc gcc.gcc;
gccStdInc = wrapGCCStdInc glibc gcc.cc;
# prolog
yap = callPackage ../development/compilers/yap { };
@ -5849,7 +5849,7 @@ let
};
kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 {
stdenv = overrideGCC stdenv gccStdInc;
stdenv = overrideCC stdenv gccStdInc;
});
kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {});
kf5_latest = kf56;
@ -10434,7 +10434,7 @@ let
};
kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
stdenv = overrideGCC stdenv gccStdInc;
stdenv = overrideCC stdenv gccStdInc;
});
kdeApps_latest = kdeApps_14_12;
kdeApps_stable = kdeApps_14_12;
@ -12521,7 +12521,7 @@ let
mate-themes = callPackage ../misc/themes/mate-themes { };
plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 {
stdenv = overrideGCC stdenv gccStdInc;
stdenv = overrideCC stdenv gccStdInc;
});
plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {});
plasma5_latest = plasma52;