diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix index ee43903a00a1..7d030050f9d4 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -12,23 +11,21 @@ , libgee , libhandy , granite -, gettext , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "switchboard"; - version = "6.0.0"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim"; + sha256 = "sha256-2c+anQ17lrdFy+cbjoYY94EFxYUcS+4mZrwbrLohfUg="; }; nativeBuildInputs = [ - gettext meson ninja pkg-config @@ -46,18 +43,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 = '' |