From f908b3e348ecfd7651f455d3afa7ba49b027a6ab Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 4 May 2022 09:20:06 +0800 Subject: [PATCH] pantheon.switchboard: 6.0.0 -> 6.0.1 --- .../pantheon/apps/switchboard/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index ee43903a00a1..cc719e65dfa9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "switchboard"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim"; + sha256 = "sha256-QMh9m6Xc0BeprZHrOgcmSireWb8Ja7Td0COYMgYw+5M="; }; nativeBuildInputs = [ @@ -46,18 +45,6 @@ stdenv.mkDerivation rec { 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"; - }) - # Fix build with meson 0.61 - # https://github.com/elementary/switchboard/pull/226 - (fetchpatch { - url = "https://github.com/elementary/switchboard/commit/ecf2a6c42122946cc84150f6927ef69c1f67c909.patch"; - sha256 = "sha256-J62tMeDfOpliBLHMSa3uBGTc0RBNzC6eDjDBDYySL+0="; - }) ]; postPatch = ''