diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-01-04 01:42:10 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-01-04 01:42:26 +0100 |
| commit | 27660cfdc01c9a7481b4646285ab155cca784c38 (patch) | |
| tree | 3bfb5e18da3df6f88fd42ea7ad6e950aed68ac42 /pkgs/applications/office | |
| parent | 293551a16286f2e1134707babdb013a29bf778ce (diff) | |
| parent | 61d125b8425da501f07765197186ed7351a55f48 (diff) | |
| download | nixlib-27660cfdc01c9a7481b4646285ab155cca784c38.tar nixlib-27660cfdc01c9a7481b4646285ab155cca784c38.tar.gz nixlib-27660cfdc01c9a7481b4646285ab155cca784c38.tar.bz2 nixlib-27660cfdc01c9a7481b4646285ab155cca784c38.tar.lz nixlib-27660cfdc01c9a7481b4646285ab155cca784c38.tar.xz nixlib-27660cfdc01c9a7481b4646285ab155cca784c38.tar.zst nixlib-27660cfdc01c9a7481b4646285ab155cca784c38.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 3 |
2 files changed, 4 insertions, 2 deletions
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" ]; }; } |