pantheon-tweaks: 1.1.2 -> 2.0.1

Also move to by-name.

https://github.com/pantheon-tweaks/pantheon-tweaks/compare/1.1.2...2.0.1

3 files changed, 2 insertions, 86 deletions

diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index d7bd9c926ede..58a4ba65f1ac 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/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,
-  # specifically third party switchboard plugins and wingpanel indicators.
-  # Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
-  # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
+  # As suggested in https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
+  # please avoid putting third-party packages in the `pantheon` scope.
 
 }) // lib.optionalAttrs config.allowAliases {
 
diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix
deleted file mode 100644
index c05c4b9b0a25..000000000000
--- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, nix-update-script
-, meson
-, ninja
-, pkg-config
-, python3
-, vala
-, gtk3
-, libgee
-, pantheon
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pantheon-tweaks";
-  version = "1.1.2";
-
-  src = fetchFromGitHub {
-    owner = "pantheon-tweaks";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-E9YSRfh9bLAHn2y4p3aKwR5NOtexKokLWj3RwtDnLsQ=";
-  };
-
-  patches = [
-    ./fix-paths.patch
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    python3
-    vala
-  ];
-
-  buildInputs = [
-    gtk3
-    libgee
-  ] ++ (with pantheon; [
-    elementary-files # settings schemas
-    elementary-terminal # settings schemas
-    granite
-    switchboard
-  ]);
-
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "Unofficial system settings panel for Pantheon";
-    longDescription = ''
-      Unofficial system settings panel 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;
-  };
-}
diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch
deleted file mode 100644
index b2e0e0a7b4c8..000000000000
--- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch
+++ /dev/null
@@ -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 + "/"};
-