summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-05-17 01:59:26 +0200
committerGitHub <noreply@github.com>2021-05-17 01:59:26 +0200
commit8aea69e5ab0bd8f276854c8b3024a8ee70a4275a (patch)
treec779ee6a73c72f791c32e44e986ad7a2f0139d92 /pkgs/applications/window-managers
parent3db5ed6d34af2b58593be40856ec56a1032c402a (diff)
parent16ccf81982f27b609173f7f630f5a47d775b6c12 (diff)
downloadnixpkgs-8aea69e5ab0bd8f276854c8b3024a8ee70a4275a.tar
nixpkgs-8aea69e5ab0bd8f276854c8b3024a8ee70a4275a.tar.gz
nixpkgs-8aea69e5ab0bd8f276854c8b3024a8ee70a4275a.tar.bz2
nixpkgs-8aea69e5ab0bd8f276854c8b3024a8ee70a4275a.tar.lz
nixpkgs-8aea69e5ab0bd8f276854c8b3024a8ee70a4275a.tar.xz
nixpkgs-8aea69e5ab0bd8f276854c8b3024a8ee70a4275a.tar.zst
nixpkgs-8aea69e5ab0bd8f276854c8b3024a8ee70a4275a.zip
Merge pull request #123198 from AndersonTorres/new-cardboard
cardboard: 0.0.0-unstable=2021-01-21 -> 0.0.0+unstable=2021-05-10
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/cardboard/default.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/window-managers/cardboard/default.nix b/pkgs/applications/window-managers/cardboard/default.nix
index ec4f738877b..17ef08af5e8 100644
--- a/pkgs/applications/window-managers/cardboard/default.nix
+++ b/pkgs/applications/window-managers/cardboard/default.nix
@@ -15,6 +15,7 @@
 , mesa
 , meson
 , ninja
+, pandoc
 , pixman
 , pkg-config
 , unzip
@@ -56,18 +57,19 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cardboard";
-  version = "0.0.0-unstable=2021-01-21";
+  version = "0.0.0+unstable=2021-05-10";
 
   src = fetchFromGitLab {
     owner = "cardboardwm";
     repo = pname;
-    rev = "f2ef2ff076ddbbd23994553b8eff131f9bd0207f";
-    hash = "sha256-43aqAWk4QoIP0BpRyPRDWFtVh/1UbrBoEeTDEF2gZX4=";
+    rev = "b54758d85164fb19468f5ca52588ebea576cd027";
+    hash = "sha256-Kn5NyQSDyX7/nn2bKZPnsuepkoppi5XIkdu7IDy5r4w=";
   };
 
   nativeBuildInputs = [
     meson
     ninja
+    pandoc
     pkg-config
     unzip
   ];
@@ -101,6 +103,7 @@ stdenv.mkDerivation rec {
 
   # "Inherited" from Nixpkgs expression for wlroots
   mesonFlags = [
+    "-Dman=true"
     "-Dwlroots:logind-provider=systemd"
     "-Dwlroots:libseat=disabled"
   ];