Merge pull request #138428 from bobby285271/pantheon-tweaks

pantheon-tweaks: init at 1.0.1

authored by

davidak and committed by
GitHub
a0d68379 cdd4d1ce

+112
+7
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
··· 273 273 <link linkend="opt-services.touchegg.enable">services.touchegg</link>. 274 274 </para> 275 275 </listitem> 276 + <listitem> 277 + <para> 278 + <link xlink:href="https://github.com/pantheon-tweaks/pantheon-tweaks">pantheon-tweaks</link>, 279 + an unofficial system settings panel for Pantheon. Available as 280 + <link linkend="opt-programs.pantheon-tweaks.enable">programs.pantheon-tweaks</link>. 281 + </para> 282 + </listitem> 276 283 </itemizedlist> 277 284 </section> 278 285 <section xml:id="sec-release-21.11-incompatibilities">
+2
nixos/doc/manual/release-notes/rl-2111.section.md
··· 86 86 87 87 - [touchegg](https://github.com/JoseExposito/touchegg), a multi-touch gesture recognizer. Available as [services.touchegg](#opt-services.touchegg.enable). 88 88 89 + - [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as [programs.pantheon-tweaks](#opt-programs.pantheon-tweaks.enable). 90 + 89 91 ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} 90 92 91 93 - The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set.
+1
nixos/modules/module-list.nix
··· 171 171 ./programs/npm.nix 172 172 ./programs/noisetorch.nix 173 173 ./programs/oblogout.nix 174 + ./programs/pantheon-tweaks.nix 174 175 ./programs/partition-manager.nix 175 176 ./programs/plotinus.nix 176 177 ./programs/proxychains.nix
+19
nixos/modules/programs/pantheon-tweaks.nix
··· 1 + { config, lib, pkgs, ... }: 2 + 3 + with lib; 4 + 5 + { 6 + meta = { 7 + maintainers = teams.pantheon.members; 8 + }; 9 + 10 + ###### interface 11 + options = { 12 + programs.pantheon-tweaks.enable = mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon"; 13 + }; 14 + 15 + ###### implementation 16 + config = mkIf config.programs.pantheon-tweaks.enable { 17 + services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ]; 18 + }; 19 + }
+68
pkgs/applications/system/pantheon-tweaks/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , nix-update-script 5 + , meson 6 + , ninja 7 + , pkg-config 8 + , python3 9 + , vala 10 + , gtk3 11 + , libgee 12 + , pantheon 13 + }: 14 + 15 + stdenv.mkDerivation rec { 16 + pname = "pantheon-tweaks"; 17 + version = "1.0.1"; 18 + 19 + src = fetchFromGitHub { 20 + owner = "pantheon-tweaks"; 21 + repo = pname; 22 + rev = version; 23 + sha256 = "sha256-tAfDxX/RD7pO5PN/LaZ92Cj/iZtBI/EHb0+pORfYnPM="; 24 + }; 25 + 26 + patches = [ 27 + ./fix-paths.patch 28 + ]; 29 + 30 + nativeBuildInputs = [ 31 + meson 32 + ninja 33 + pkg-config 34 + python3 35 + vala 36 + ]; 37 + 38 + buildInputs = [ 39 + gtk3 40 + libgee 41 + pantheon.granite 42 + pantheon.switchboard 43 + ]; 44 + 45 + postPatch = '' 46 + chmod +x meson/post_install.py 47 + patchShebangs meson/post_install.py 48 + ''; 49 + 50 + passthru = { 51 + updateScript = nix-update-script { 52 + attrPath = pname; 53 + }; 54 + }; 55 + 56 + meta = with lib; { 57 + description = "Unofficial system settings panel for Pantheon"; 58 + longDescription = '' 59 + Unofficial system settings panel for Pantheon 60 + that lets you easily and safely customise your desktop's appearance. 61 + Use programs.pantheon-tweaks.enable to add this to your switchboard. 62 + ''; 63 + homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks"; 64 + license = licenses.gpl3Plus; 65 + platforms = platforms.linux; 66 + maintainers = teams.pantheon.members; 67 + }; 68 + }
+13
pkgs/applications/system/pantheon-tweaks/fix-paths.patch
··· 1 + diff --git a/src/Settings/ThemeSettings.vala b/src/Settings/ThemeSettings.vala 2 + index 589121b..8e9c81e 100644 3 + --- a/src/Settings/ThemeSettings.vala 4 + +++ b/src/Settings/ThemeSettings.vala 5 + @@ -29,7 +29,7 @@ public class PantheonTweaks.ThemeSettings { 6 + var themes = new Gee.ArrayList<string> (); 7 + 8 + string[] dirs = { 9 + - "/usr/share/" + path + "/", 10 + + "/run/current-system/sw/share/" + path + "/", 11 + Environment.get_home_dir () + "/." + path + "/", 12 + Environment.get_home_dir () + "/.local/share/" + path + "/"}; 13 +
+2
pkgs/top-level/all-packages.nix
··· 8023 8023 8024 8024 pamtester = callPackage ../tools/security/pamtester { }; 8025 8025 8026 + pantheon-tweaks = callPackage ../applications/system/pantheon-tweaks { }; 8027 + 8026 8028 paperless-ng = callPackage ../applications/office/paperless-ng { }; 8027 8029 8028 8030 paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };