From b53a03a13236c391bfba6c653bd6df5cabc26810 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 2 Apr 2023 00:22:43 +0800 Subject: [PATCH] wf-config: update --- .../window-managers/wayfire/wf-config.nix | 44 +++++++++++++++---- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index d1e653cc9e04..0a8e5c0bcd71 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -1,20 +1,46 @@ -{ stdenv, lib, fetchurl, cmake, meson, ninja, pkg-config -, doctest, glm, libevdev, libxml2 +{ stdenv +, lib +, fetchFromGitHub +, cmake +, meson +, ninja +, pkg-config +, doctest +, glm +, libevdev +, libxml2 }: stdenv.mkDerivation rec { pname = "wf-config"; version = "0.7.1"; - src = fetchurl { - url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz"; - sha256 = "1w75yxhz0nvw4mlv38sxp8k8wb5h99b51x3fdvizc3yaxanqa8kx"; + src = fetchFromGitHub { + owner = "WayfireWM"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; }; - nativeBuildInputs = [ cmake meson ninja pkg-config ]; - buildInputs = [ doctest libevdev libxml2 ]; - propagatedBuildInputs = [ glm ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + buildInputs = [ + libevdev + libxml2 + ]; + + propagatedBuildInputs = [ + glm + ]; + + nativeCheckInputs = [ + cmake + doctest + ]; # CMake is just used for finding doctest. dontUseCmakeConfigure = true; @@ -24,7 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/WayfireWM/wf-config"; description = "Library for managing configuration files, written for Wayfire"; license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 ]; + maintainers = with maintainers; [ qyliss wucke13 rewine ]; platforms = platforms.unix; }; }