diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-01-03 13:54:07 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-01-03 13:55:26 +0100 |
commit | b4f401104d3f00d68a42475968854fc111eb0866 (patch) | |
tree | c398be83af902087f7a011027cc2b14f6879c413 /pkgs/applications | |
parent | 586ceaf718e6ddced417cbcfddcba52039b4ef18 (diff) | |
download | nixpkgs-b4f401104d3f00d68a42475968854fc111eb0866.tar nixpkgs-b4f401104d3f00d68a42475968854fc111eb0866.tar.gz nixpkgs-b4f401104d3f00d68a42475968854fc111eb0866.tar.bz2 nixpkgs-b4f401104d3f00d68a42475968854fc111eb0866.tar.lz nixpkgs-b4f401104d3f00d68a42475968854fc111eb0866.tar.xz nixpkgs-b4f401104d3f00d68a42475968854fc111eb0866.tar.zst nixpkgs-b4f401104d3f00d68a42475968854fc111eb0866.zip |
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
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 58e5ab98c16..75f2dcda6a6 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -42,6 +42,8 @@ mkChromiumDerivation (base: rec { passthru = { inherit sandboxExecutableName; }; + requiredSystemFeatures = [ "big-parallel" ]; + meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; @@ -49,6 +51,5 @@ mkChromiumDerivation (base: rec { license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else []; - requiredSystemFeatures = [ "big-parallel" ]; }; }) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 39d4688b639..29cc1dc118f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -251,6 +251,8 @@ 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/; @@ -258,6 +260,5 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; hydraPlatforms = []; - requiredSystemFeatures = [ "big-parallel" ]; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index b3d69ef7f19..75d295887f6 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -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" ]; }; } |