summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-04-29 02:50:56 +0000
committerAlyssa Ross <hi@alyssa.is>2021-04-29 10:04:20 +0000
commite337e136dde11304353327082d23374c253750d3 (patch)
tree616bbbec729785a99285360eeefa3f3d1ef35b8e
parentf7dccd8e25a867c530857639d1ceb9edd6472c98 (diff)
downloadnixpkgs-e337e136dde11304353327082d23374c253750d3.tar
nixpkgs-e337e136dde11304353327082d23374c253750d3.tar.gz
nixpkgs-e337e136dde11304353327082d23374c253750d3.tar.bz2
nixpkgs-e337e136dde11304353327082d23374c253750d3.tar.lz
nixpkgs-e337e136dde11304353327082d23374c253750d3.tar.xz
nixpkgs-e337e136dde11304353327082d23374c253750d3.tar.zst
nixpkgs-e337e136dde11304353327082d23374c253750d3.zip
wf-config: 0.7.0 -> 0.7.1; enable tests
-rw-r--r--pkgs/applications/window-managers/wayfire/wf-config.nix17
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix
index b8e4c6aa770..d1e653cc9e0 100644
--- a/pkgs/applications/window-managers/wayfire/wf-config.nix
+++ b/pkgs/applications/window-managers/wayfire/wf-config.nix
@@ -1,18 +1,25 @@
-{ stdenv, lib, fetchurl, meson, ninja, pkg-config, glm, libevdev, libxml2 }:
+{ stdenv, lib, fetchurl, cmake, meson, ninja, pkg-config
+, doctest, glm, libevdev, libxml2
+}:
 
 stdenv.mkDerivation rec {
   pname = "wf-config";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchurl {
     url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz";
-    sha256 = "1bas5gsbnf8jxkkxd95992chz8yk5ckgg7r09gfnmm7xi8w0pyy7";
+    sha256 = "1w75yxhz0nvw4mlv38sxp8k8wb5h99b51x3fdvizc3yaxanqa8kx";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config ];
-  buildInputs = [ libevdev libxml2 ];
+  nativeBuildInputs = [ cmake meson ninja pkg-config ];
+  buildInputs = [ doctest libevdev libxml2 ];
   propagatedBuildInputs = [ glm ];
 
+  # CMake is just used for finding doctest.
+  dontUseCmakeConfigure = true;
+
+  doCheck = true;
+
   meta = with lib; {
     homepage = "https://github.com/WayfireWM/wf-config";
     description = "Library for managing configuration files, written for Wayfire";