Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
Fix big-parallel usage
Browse files Browse the repository at this point in the history
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
  • Loading branch information
edolstra committed Jan 3, 2017
1 parent 586ceaf commit b4f4011
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion pkgs/applications/networking/browsers/chromium/browser.nix
Expand Up @@ -42,13 +42,14 @@ mkChromiumDerivation (base: rec {

passthru = { inherit sandboxExecutableName; };

requiredSystemFeatures = [ "big-parallel" ];

meta = {
description = "An open source web browser from Google";
homepage = http://www.chromium.org/;
maintainers = with maintainers; [ chaoflow ];
license = licenses.bsd3;
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
requiredSystemFeatures = [ "big-parallel" ];
};
})
3 changes: 2 additions & 1 deletion pkgs/applications/office/libreoffice/default.nix
Expand Up @@ -251,13 +251,14 @@ in stdenv.mkDerivation rec {
inherit srcs;
};

requiredSystemFeatures = [ "big-parallel" ];

meta = with lib; {
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = http://libreoffice.org/;
license = licenses.lgpl3;
maintainers = with maintainers; [ viric raskin ];
platforms = platforms.linux;
hydraPlatforms = [];
requiredSystemFeatures = [ "big-parallel" ];
};
}
3 changes: 2 additions & 1 deletion pkgs/applications/office/libreoffice/still.nix
Expand Up @@ -254,12 +254,13 @@ in stdenv.mkDerivation rec {
inherit srcs;
};

requiredSystemFeatures = [ "big-parallel" ];

meta = with lib; {
description = "Comprehensive, professional-quality productivity suite (Still/stable release)";
homepage = http://libreoffice.org/;
license = licenses.lgpl3;
maintainers = with maintainers; [ viric raskin ];
platforms = platforms.linux;
requiredSystemFeatures = [ "big-parallel" ];
};
}
3 changes: 2 additions & 1 deletion pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
Expand Up @@ -35,12 +35,13 @@ in stdenv.mkDerivation rec {

enableParallelBuilding = true;

requiredSystemFeatures = [ "big-parallel" ];

meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Evolution;
description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
maintainers = gnome3.maintainers;
license = licenses.lgpl2Plus;
platforms = platforms.linux;
requiredSystemFeatures = [ "big-parallel" ];
};
}
3 changes: 2 additions & 1 deletion pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
Expand Up @@ -35,12 +35,13 @@ in stdenv.mkDerivation rec {

enableParallelBuilding = true;

requiredSystemFeatures = [ "big-parallel" ];

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

0 comments on commit b4f4011

Please sign in to comment.