From b4f401104d3f00d68a42475968854fc111eb0866 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Jan 2017 13:54:07 +0100 Subject: 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 --- pkgs/applications/office/libreoffice/default.nix | 3 ++- pkgs/applications/office/libreoffice/still.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 39d4688b639e..29cc1dc118fe 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 b3d69ef7f195..75d295887f63 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" ]; }; } -- cgit 1.4.1