Merge pull request #313416 from bobby285271/upd/pantheon-tweaks

pantheon-tweaks: 1.1.2 -> 2.0.1

nixos/doc/manual/release-notes/rl-2111.section.md

@@ -146,7 +146,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [touchegg](https://github.com/JoseExposito/touchegg), a multi-touch gesture recognizer. Available as [services.touchegg](#opt-services.touchegg.enable).
 
-- [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).
+- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as `programs.pantheon-tweaks`.
 
 - [joycond](https://github.com/DanielOgorchock/joycond), a service that uses `hid-nintendo` to provide nintendo joycond pairing and better nintendo switch pro controller support.
 

nixos/modules/module-list.nix

@@ -249,7 +249,6 @@
   ./programs/oblogout.nix
   ./programs/oddjobd.nix
   ./programs/openvpn3.nix
-  ./programs/pantheon-tweaks.nix
   ./programs/partition-manager.nix
   ./programs/plotinus.nix
   ./programs/pqos-wrapper.nix

nixos/modules/programs/pantheon-tweaks.nix

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  meta = {
-    maintainers = lib.teams.pantheon.members;
-  };
-
-  ###### interface
-  options = {
-    programs.pantheon-tweaks.enable = lib.mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon";
-  };
-
-  ###### implementation
-  config = lib.mkIf config.programs.pantheon-tweaks.enable {
-    services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ];
-  };
-}

nixos/modules/rename.nix

@@ -40,12 +40,16 @@ in
     (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
     (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.")
+    (mkRemovedOptionModule [ "programs" "pantheon-tweaks" ] ''
+      pantheon-tweaks is no longer a switchboard plugin but an independent app,
+      adding the package to environment.systemPackages is sufficient.
+    '')
     (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
       "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))
     (mkRemovedOptionModule [ "security" "hideProcessInformation" ] ''
-        The hidepid module was removed, since the underlying machinery
+      The hidepid module was removed, since the underlying machinery
-        is broken when using cgroups-v2.
+      is broken when using cgroups-v2.
     '')
     (mkRemovedOptionModule [ "services" "baget" "enable" ] "The baget module was removed due to the upstream package being unmaintained.")
     (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed")

pkgs/by-name/pa/pantheon-tweaks/package.nix

@@ -7,6 +7,7 @@
 , pkg-config
 , python3
 , vala
+, wrapGAppsHook3
 , gtk3
 , libgee
 , pantheon
@@ -14,25 +15,22 @@
 
 stdenv.mkDerivation rec {
   pname = "pantheon-tweaks";
-  version = "1.1.2";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "pantheon-tweaks";
     repo = pname;
     rev = version;
-    sha256 = "sha256-E9YSRfh9bLAHn2y4p3aKwR5NOtexKokLWj3RwtDnLsQ=";
+    hash = "sha256-P3eM+xgsAMvqr2mIEjkQSjhxvQAwtSNItxAUcjO3ciY=";
   };
 
-  patches = [
-    ./fix-paths.patch
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
     python3
     vala
+    wrapGAppsHook3
   ];
 
   buildInputs = [
@@ -42,12 +40,14 @@ stdenv.mkDerivation rec {
     elementary-files # settings schemas
     elementary-terminal # settings schemas
     granite
-    switchboard
   ]);
 
   postPatch = ''
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py
+
+    substituteInPlace src/Settings/ThemeSettings.vala \
+      --replace-fail "/usr/share/" "/run/current-system/sw/share/"
   '';
 
   passthru = {
@@ -55,15 +55,15 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "Unofficial system settings panel for Pantheon";
+    description = "Unofficial system customization app for Pantheon";
     longDescription = ''
-      Unofficial system settings panel for Pantheon
+      Unofficial system customization app for Pantheon
       that lets you easily and safely customise your desktop's appearance.
-      Use programs.pantheon-tweaks.enable to add this to your switchboard.
     '';
     homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = teams.pantheon.members;
+    mainProgram = "pantheon-tweaks";
   };
 }

pkgs/desktops/pantheon/default.nix

@@ -221,10 +221,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   ### THIRD-PARTY
 
-  # Put packages that ONLY works with Pantheon in pkgs/desktops/pantheon/third-party,
+  # As suggested in https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
-  # specifically third party switchboard plugins and wingpanel indicators.
+  # please avoid putting third-party packages in the `pantheon` scope.
-  # Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
-  # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
 
 }) // lib.optionalAttrs config.allowAliases {
 

pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch

@@ -1,13 +0,0 @@
-diff --git a/src/Settings/ThemeSettings.vala b/src/Settings/ThemeSettings.vala
-index 589121b..8e9c81e 100644
---- a/src/Settings/ThemeSettings.vala
-+++ b/src/Settings/ThemeSettings.vala
-@@ -29,7 +29,7 @@ public class PantheonTweaks.ThemeSettings {
-         var themes = new Gee.ArrayList<string> ();
- 
-         string[] dirs = {
--            "/usr/share/" + path + "/",
-+            "/run/current-system/sw/share/" + path + "/",
-             Environment.get_home_dir () + "/." + path + "/",
-             Environment.get_home_dir () + "/.local/share/" + path + "/"};
- 

pkgs/top-level/all-packages.nix

@@ -37707,8 +37707,6 @@ with pkgs;
 
   pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
 
-  pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { };
-
   wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };
 
   rox-filer = callPackage ../desktops/rox/rox-filer {