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 21:35:05 +0800
committerBobby Rong <rjl931189261@126.com>2021-09-18 19:33:23 +0800
commite79876b1f7f87830d7503ecb243e7c0b71652e39 (patch)
tree06a85a67ad5b7bd9a1751b9ee4a8a34325963bde /pkgs/desktops/pantheon/apps
parent4ec195a9c1d17fcaf0d646644053b04dbd8f4080 (diff)
downloadnixpkgs-e79876b1f7f87830d7503ecb243e7c0b71652e39.tar
nixpkgs-e79876b1f7f87830d7503ecb243e7c0b71652e39.tar.gz
nixpkgs-e79876b1f7f87830d7503ecb243e7c0b71652e39.tar.bz2
nixpkgs-e79876b1f7f87830d7503ecb243e7c0b71652e39.tar.lz
nixpkgs-e79876b1f7f87830d7503ecb243e7c0b71652e39.tar.xz
nixpkgs-e79876b1f7f87830d7503ecb243e7c0b71652e39.tar.zst
nixpkgs-e79876b1f7f87830d7503ecb243e7c0b71652e39.zip
pantheon.switchboard: 2.4.0 -> 6.0.0
Diffstat (limited to 'pkgs/desktops/pantheon/apps')
-rw-r--r--pkgs/desktops/pantheon/apps/switchboard/default.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index d0b56d7456a..9580f063ba0 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , pantheon
 , pkg-config
@@ -9,6 +10,7 @@
 , vala
 , gtk3
 , libgee
+, libhandy
 , granite
 , gettext
 , clutter-gtk
@@ -18,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard";
-  version = "2.4.0";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-N3WZysLIah40kcyIyhryZpm2FxCmlvp0EB1krZ/IsYs=";
+    sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim";
   };
 
   passthru = {
@@ -49,10 +51,17 @@ stdenv.mkDerivation rec {
     granite
     gtk3
     libgee
+    libhandy
   ];
 
   patches = [
     ./plugs-path-env.patch
+    # Upstream code not respecting our localedir
+    # https://github.com/elementary/switchboard/pull/214
+    (fetchpatch {
+      url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch";
+      sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc";
+    })
   ];
 
   postPatch = ''