Merge branch 'upstream-merge' into master

1 files changed, 5 insertions, 21 deletions

diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix
index 31e0b5a7a49..dad9c555f5e 100644
--- a/pkgs/applications/window-managers/wayfire/wf-config.nix
+++ b/pkgs/applications/window-managers/wayfire/wf-config.nix
@@ -1,30 +1,14 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config
-, glm, libevdev, libxml2
-}:
+{ stdenv, lib, fetchurl, meson, ninja, pkg-config, glm, libevdev, libxml2 }:
 
 stdenv.mkDerivation rec {
   pname = "wf-config";
-  version = "0.4.0";
+  version = "0.5.0";
 
-  src = fetchFromGitHub {
-    owner = "WayfireWM";
-    repo = "wf-config";
-    rev = version;
-    sha256 = "0pb2v71x0dv9s96wi20d9bc9rlxzr85rba7vny6751j7frqr4xf7";
+  src = fetchurl {
+    url = "https://github.com/WayfireWM/wf-config/releases/download/0.5.0/wf-config-0.5.0.tar.xz";
+    sha256 = "0xbvfy31pl6mj0nac921gqksyh6jb8ccap30p94lw6r6fb17wz57";
   };
 
-  patches = [
-    # Modify wf::config::build_configuration to allow plugins
-    # installed outside of Wayfire's prefix.  Otherwise, we'd have to
-    # build all Wayfire plugins in the wayfire derivation.  Remove if
-    # <https://github.com/WayfireWM/wf-config/pull/25> is applied
-    # upstream.
-    (fetchpatch {
-      url = "https://github.com/WayfireWM/wf-config/commit/36578282f774d71eb8ebcd2dfc9d923eb70ac637.patch";
-      sha256 = "152744xgi9ha135r7qfyivdl5cgcp9kik224ncwqv9a480m7nwj6";
-    })
-  ];
-
   strictDeps = true;
   nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = [ libevdev libxml2 ];