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

kf56, plasma52: use ordinary stdenv

Browse Source
This commit is contained in:
Thomas Tuegel 2015-01-28 08:40:27 -06:00
parent 41d5797478
commit aa308252ac
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/plasma-5.2/default.nix
View File

@ -127,10 +127,6 @@ let
substituteInPlace kcms/dateandtime/helper.cpp \
--subst-var-by hwclock "${utillinux}/sbin/hwclock"
'';
enableParallelBuilding = false;
NIX_CFLAGS_COMPILE =
(super.plasma-desktop.NIX_CFLAGS_COMPILE or "")
+ " -Wno-error=return-type";
};
plasma-workspace = with pkgs; super.plasma-workspace // {

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

@ -5814,9 +5814,7 @@ let
kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 {
stdenv = overrideGCC stdenv gccStdInc;
});
kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {
stdenv = overrideGCC stdenv gccStdInc;
});
kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {});
kf5_latest = kf56;
kf5_stable = kf55;
@ -12462,9 +12460,7 @@ let
plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 {
stdenv = overrideGCC stdenv gccStdInc;
});
plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
stdenv = overrideGCC stdenv gccStdInc;
});
plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {});
plasma5_latest = plasma52;
plasma5_stable = plasma51;