summary refs log tree commit diff
path: root/pkgs/desktops/pantheon/apps
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2021-07-16 23:06:58 +0800
committerBobby Rong <rjl931189261@126.com>2021-09-18 19:33:32 +0800
commit627c9fc86d9108f7d669641b66e45d4c46d65bc0 (patch)
tree63e1679d6632c81446c11e3d2aa6411860eb8f76 /pkgs/desktops/pantheon/apps
parent0f4d3a87b46edb704f6935c7452eba80684f5b6b (diff)
downloadnixpkgs-627c9fc86d9108f7d669641b66e45d4c46d65bc0.tar
nixpkgs-627c9fc86d9108f7d669641b66e45d4c46d65bc0.tar.gz
nixpkgs-627c9fc86d9108f7d669641b66e45d4c46d65bc0.tar.bz2
nixpkgs-627c9fc86d9108f7d669641b66e45d4c46d65bc0.tar.lz
nixpkgs-627c9fc86d9108f7d669641b66e45d4c46d65bc0.tar.xz
nixpkgs-627c9fc86d9108f7d669641b66e45d4c46d65bc0.tar.zst
nixpkgs-627c9fc86d9108f7d669641b66e45d4c46d65bc0.zip
pantheon.switchboard-plug-applications: 2.1.7 -> 6.0.0
Diffstat (limited to 'pkgs/desktops/pantheon/apps')
-rw-r--r--pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix18
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index 66596fa2ff1..325ad3b96fe 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , pantheon
 , meson
@@ -10,19 +11,29 @@
 , granite
 , gtk3
 , switchboard
+, flatpak
 }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-applications";
-  version = "2.1.7";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-uiu19XyogNR0LX/2IIZM6B1JKAfqDMOHniQ29EAa9XM=";
+    sha256 = "0hgvmrgg6g2sjb3sda7kzfcd3zgngd5w982drl6ll44k1mh16gsj";
   };
 
+  patches = [
+    # Upstream code not respecting our localedir
+    # https://github.com/elementary/switchboard-plug-applications/pull/163
+    (fetchpatch {
+      url = "https://github.com/elementary/switchboard-plug-applications/commit/25db490654ab41694be7b7ba19218376f42fbb8d.patch";
+      sha256 = "16y8zcwnnjsh72ifpyqcdb9f5ajdj0iy8kb5sj6v77c1cxdhrv29";
+    })
+  ];
+
   passthru = {
     updateScript = nix-update-script {
       attrPath = "pantheon.${pname}";
@@ -37,6 +48,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    flatpak
     granite
     gtk3
     libgee
@@ -46,7 +58,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Switchboard Applications Plug";
     homepage = "https://github.com/elementary/switchboard-plug-applications";
-    license = licenses.gpl2Plus;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = pantheon.maintainers;
   };