diff options
author | Malte Brandy <malte.brandy@maralorn.de> | 2021-05-07 15:03:54 +0200 |
---|---|---|
committer | Malte Brandy <malte.brandy@maralorn.de> | 2021-05-07 15:03:54 +0200 |
commit | 2a11f1f5cc1c4680b49240203db18ecbb19b9cc5 (patch) | |
tree | df44c5fcd797c97297ab663b63167e9b4bc06a72 /pkgs/applications/window-managers/cagebreak/default.nix | |
parent | f73c2278d07e674233040422b71d965a0587756f (diff) | |
parent | ae1c8ede09b53007ba9b3c32f926c9c03547ae8b (diff) | |
download | nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar.gz nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar.bz2 nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar.lz nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar.xz nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar.zst nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.zip |
Merge branch 'master' into haskell-updates
Diffstat (limited to 'pkgs/applications/window-managers/cagebreak/default.nix')
-rw-r--r-- | pkgs/applications/window-managers/cagebreak/default.nix | 65 |
1 files changed, 51 insertions, 14 deletions
diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index 505d1cb1520..de996f080e7 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -1,38 +1,75 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, wayland, scdoc, makeWrapper -, wlroots, wayland-protocols, pixman, libxkbcommon -, cairo , pango, fontconfig, pandoc, systemd, mesa -, withXwayland ? true, xwayland +{ lib +, stdenv +, fetchFromGitHub +, cairo +, fontconfig +, libxkbcommon +, makeWrapper +, mesa +, meson +, ninja , nixosTests +, pandoc +, pango +, pixman +, pkg-config +, scdoc +, systemd +, wayland +, wayland-protocols +, withXwayland ? true , xwayland +, wlroots }: stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "project-repo"; - repo = "cagebreak"; + repo = pname; rev = version; - hash = "sha256-F7fqDVbJS6pVgmj6C1/l9PAaz5yzcYpaq6oc6a6v/Qk="; + hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI="; }; - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + meson + ninja + pandoc + pkg-config + scdoc + wayland + ]; buildInputs = [ - wlroots wayland wayland-protocols pixman libxkbcommon cairo - pango fontconfig pandoc systemd + cairo + fontconfig + libxkbcommon mesa # for libEGL headers + pango + pixman + systemd + wayland + wayland-protocols + wlroots ]; - outputs = [ "out" "contrib" ]; + outputs = [ + "out" + "contrib" + ]; mesonFlags = [ - "-Dxwayland=${lib.boolToString withXwayland}" - "-Dversion_override=${version}" "-Dman-pages=true" + "-Dversion_override=${version}" + "-Dxwayland=${lib.boolToString withXwayland}" ]; + postPatch = '' + sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c + ''; + postInstall = '' mkdir -p $contrib/share/cagebreak cp $src/examples/config $contrib/share/cagebreak/config |