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

Fix big-parallel usage 

requiredSystemFeatures is not a meta attribute but a derivation
attribute. So "big-parallel" was being ignored on e.g. chromium,
causing it to be built (and timing out) on slow machines.

http://hydra.nixos.org/build/45819778#tabs-buildsteps
This commit is contained in:
Eelco Dolstra 2017-01-03 13:54:07 +01:00
parent 586ceaf718
commit b4f401104d
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@ -42,6 +42,8 @@ mkChromiumDerivation (base: rec {
passthru = { inherit sandboxExecutableName; }; passthru = { inherit sandboxExecutableName; };
requiredSystemFeatures = [ "big-parallel" ];
meta = { meta = {
description = "An open source web browser from Google"; description = "An open source web browser from Google";
homepage = http://www.chromium.org/; homepage = http://www.chromium.org/;
@ -49,6 +51,5 @@ mkChromiumDerivation (base: rec {
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.linux; platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else []; hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
requiredSystemFeatures = [ "big-parallel" ];
}; };
}) })

3
pkgs/applications/office/libreoffice/default.nix
View File

@ -251,6 +251,8 @@ in stdenv.mkDerivation rec {
inherit srcs; inherit srcs;
}; };
requiredSystemFeatures = [ "big-parallel" ];
meta = with lib; { meta = with lib; {
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = http://libreoffice.org/; homepage = http://libreoffice.org/;
@ -258,6 +260,5 @@ in stdenv.mkDerivation rec {
maintainers = with maintainers; [ viric raskin ]; maintainers = with maintainers; [ viric raskin ];
platforms = platforms.linux; platforms = platforms.linux;
hydraPlatforms = []; hydraPlatforms = [];
requiredSystemFeatures = [ "big-parallel" ];
}; };
} }

3
pkgs/applications/office/libreoffice/still.nix
View File

@ -254,12 +254,13 @@ in stdenv.mkDerivation rec {
inherit srcs; inherit srcs;
}; };
requiredSystemFeatures = [ "big-parallel" ];
meta = with lib; { meta = with lib; {
description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; description = "Comprehensive, professional-quality productivity suite (Still/stable release)";
homepage = http://libreoffice.org/; homepage = http://libreoffice.org/;
license = licenses.lgpl3; license = licenses.lgpl3;
maintainers = with maintainers; [ viric raskin ]; maintainers = with maintainers; [ viric raskin ];
platforms = platforms.linux; platforms = platforms.linux;
requiredSystemFeatures = [ "big-parallel" ];
}; };
} }

3
pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
View File

@ -35,12 +35,13 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
requiredSystemFeatures = [ "big-parallel" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Evolution; homepage = https://wiki.gnome.org/Apps/Evolution;
description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
requiredSystemFeatures = [ "big-parallel" ];
}; };
} }

3
pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
View File

@ -35,12 +35,13 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
requiredSystemFeatures = [ "big-parallel" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Evolution; homepage = https://wiki.gnome.org/Apps/Evolution;
description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
requiredSystemFeatures = [ "big-parallel" ];
}; };
} }