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/desktops | |
| parent | 586ceaf718e6ddced417cbcfddcba52039b4ef18 (diff) | |
| download | nixlib-b4f401104d3f00d68a42475968854fc111eb0866.tar nixlib-b4f401104d3f00d68a42475968854fc111eb0866.tar.gz nixlib-b4f401104d3f00d68a42475968854fc111eb0866.tar.bz2 nixlib-b4f401104d3f00d68a42475968854fc111eb0866.tar.lz nixlib-b4f401104d3f00d68a42475968854fc111eb0866.tar.xz nixlib-b4f401104d3f00d68a42475968854fc111eb0866.tar.zst nixlib-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/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix index 0a52acbc30e9..095c6e7814eb 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix @@ -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" ]; }; } diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix index 0b72bf5965e0..87a014f8f74e 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix @@ -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" ]; }; } |