diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-01-23 14:19:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 14:19:59 +0100 |
commit | 5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0 (patch) | |
tree | bf1b42672414ba60bcaa790e432731bfe7748e6a /pkgs/applications/window-managers/cage/default.nix | |
parent | ab6eebbe204836d04614ff70aa5f4f1d34ab0569 (diff) | |
parent | 4eedf77818f48ff20f18dd14b2d9f719f1f6a573 (diff) | |
download | nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar.gz nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar.bz2 nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar.lz nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar.xz nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar.zst nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.zip |
Merge pull request #76787 from primeos/sway
sway: 1.2 -> 1.4, wlroots: 0.8.1 -> 0.10.0
Diffstat (limited to 'pkgs/applications/window-managers/cage/default.nix')
-rw-r--r-- | pkgs/applications/window-managers/cage/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index ce4031b92f5..fe5e9c4e2e3 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkgconfig, makeWrapper , wlroots, wayland, wayland-protocols, pixman, libxkbcommon , systemd, libGL, libX11 @@ -6,14 +6,20 @@ }: stdenv.mkDerivation rec { - pname = "cage"; - version = "0.1.1"; + pname = "cage-unstable"; + version = "2020-01-18"; + # The last stable release (0.1.1) would require at least the following 3 patches: + # - https://github.com/Hjdskes/cage/commit/33bb3c818c5971777b6f09d8821e7f078d38d262.patch + # - https://github.com/Hjdskes/cage/commit/51e6c760da51e2b885737d61a61cdc965bb9269d.patch + # - https://github.com/Hjdskes/cage/commit/84216ca2a417b237ad61c11e2f3ebbcb91681ece.patch + # Which need to be adapted due to other changes. At this point it seems + # better to use the current master version until the next stable release. src = fetchFromGitHub { owner = "Hjdskes"; - repo = pname; - rev = "v${version}"; - sha256 = "1vp4mfkflrjmlgyx5mkbzdi3iq58m76q7l9dfrsk85xn0642d6q1"; + repo = "cage"; + rev = "cc1f975c442ebd691b70196d76aa120ead717810"; + sha256 = "1gkqx26pvlw00b3fgx6sh87yyjfzyj51jwxvbf9k117npkrf4b2g"; }; nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ]; |