pyrox.dev / nixpkgs
lol
fork atom

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

Eelco Dolstra b4f40110 586ceaf7

+10 -5
unified split
+2 -1
pkgs/applications/networking/browsers/chromium/browser.nix
··· 42 42 43 43 passthru = { inherit sandboxExecutableName; }; 44 44 45 + requiredSystemFeatures = [ "big-parallel" ]; 46 + 45 47 meta = { 46 48 description = "An open source web browser from Google"; 47 49 homepage = http://www.chromium.org/; ··· 49 51 license = licenses.bsd3; 50 52 platforms = platforms.linux; 51 53 hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else []; 52 - requiredSystemFeatures = [ "big-parallel" ]; 53 54 }; 54 55 })
+2 -1
pkgs/applications/office/libreoffice/default.nix
··· 251 251 inherit srcs; 252 252 }; 253 253 254 + requiredSystemFeatures = [ "big-parallel" ]; 255 + 254 256 meta = with lib; { 255 257 description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; 256 258 homepage = http://libreoffice.org/; ··· 258 260 maintainers = with maintainers; [ viric raskin ]; 259 261 platforms = platforms.linux; 260 262 hydraPlatforms = []; 261 - requiredSystemFeatures = [ "big-parallel" ]; 262 263 }; 263 264 }
+2 -1
pkgs/applications/office/libreoffice/still.nix
··· 254 254 inherit srcs; 255 255 }; 256 256 257 + requiredSystemFeatures = [ "big-parallel" ]; 258 + 257 259 meta = with lib; { 258 260 description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; 259 261 homepage = http://libreoffice.org/; 260 262 license = licenses.lgpl3; 261 263 maintainers = with maintainers; [ viric raskin ]; 262 264 platforms = platforms.linux; 263 - requiredSystemFeatures = [ "big-parallel" ]; 264 265 }; 265 266 }
+2 -1
pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
··· 35 35 36 36 enableParallelBuilding = true; 37 37 38 + requiredSystemFeatures = [ "big-parallel" ]; 39 + 38 40 meta = with stdenv.lib; { 39 41 homepage = https://wiki.gnome.org/Apps/Evolution; 40 42 description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; 41 43 maintainers = gnome3.maintainers; 42 44 license = licenses.lgpl2Plus; 43 45 platforms = platforms.linux; 44 - requiredSystemFeatures = [ "big-parallel" ]; 45 46 }; 46 47 }
+2 -1
pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
··· 35 35 36 36 enableParallelBuilding = true; 37 37 38 + requiredSystemFeatures = [ "big-parallel" ]; 39 + 38 40 meta = with stdenv.lib; { 39 41 homepage = https://wiki.gnome.org/Apps/Evolution; 40 42 description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; 41 43 maintainers = gnome3.maintainers; 42 44 license = licenses.lgpl2Plus; 43 45 platforms = platforms.linux; 44 - requiredSystemFeatures = [ "big-parallel" ]; 45 46 }; 46 47 }