diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-16 18:27:14 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-16 18:27:14 -0700 |
| commit | d8e62d8e4152a94361e95c0392ce0c9e3b59662c (patch) | |
| tree | 0e5f615cb3091708d22015b517628c0333f28da8 /pkgs/applications/window-managers | |
| parent | 6020fe250894e3589d517767d7691fe34f5f5a52 (diff) | |
| parent | 8aea69e5ab0bd8f276854c8b3024a8ee70a4275a (diff) | |
| download | nixpkgs-d8e62d8e4152a94361e95c0392ce0c9e3b59662c.tar nixpkgs-d8e62d8e4152a94361e95c0392ce0c9e3b59662c.tar.gz nixpkgs-d8e62d8e4152a94361e95c0392ce0c9e3b59662c.tar.bz2 nixpkgs-d8e62d8e4152a94361e95c0392ce0c9e3b59662c.tar.lz nixpkgs-d8e62d8e4152a94361e95c0392ce0c9e3b59662c.tar.xz nixpkgs-d8e62d8e4152a94361e95c0392ce0c9e3b59662c.tar.zst nixpkgs-d8e62d8e4152a94361e95c0392ce0c9e3b59662c.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Fix cargo-flash build
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/cardboard/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/river/default.nix | 2 |
2 files changed, 7 insertions, 4 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" ]; diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index a7331aa39af..b8b53027219 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "A dynamic tiling wayland compositor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fortuneteller2k ]; }; } |