pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #121652 from AndersonTorres/quick-patches

cagebreak: 1.6.0 -> 1.7.0

authored by

Anderson Torres and committed by
GitHub 1b1d7e93 0e2936eb

+52 -17
unified split
+51 -14
pkgs/applications/window-managers/cagebreak/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub 2 - , meson, ninja, pkg-config, wayland, scdoc, makeWrapper 3 - , wlroots, wayland-protocols, pixman, libxkbcommon 4 - , cairo , pango, fontconfig, pandoc, systemd, mesa 5 - , withXwayland ? true, xwayland 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cairo 5 + , fontconfig 6 + , libxkbcommon 7 + , makeWrapper 8 + , mesa 9 + , meson 10 + , ninja 6 11 , nixosTests 12 + , pandoc 13 + , pango 14 + , pixman 15 + , pkg-config 16 + , scdoc 17 + , systemd 18 + , wayland 19 + , wayland-protocols 20 + , withXwayland ? true , xwayland 21 + , wlroots 7 22 }: 8 23 9 24 stdenv.mkDerivation rec { 10 25 pname = "cagebreak"; 11 - version = "1.6.0"; 26 + version = "1.7.0"; 12 27 13 28 src = fetchFromGitHub { 14 29 owner = "project-repo"; 15 - repo = "cagebreak"; 30 + repo = pname; 16 31 rev = version; 17 - hash = "sha256-F7fqDVbJS6pVgmj6C1/l9PAaz5yzcYpaq6oc6a6v/Qk="; 32 + hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI="; 18 33 }; 19 34 20 - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; 35 + nativeBuildInputs = [ 36 + makeWrapper 37 + meson 38 + ninja 39 + pandoc 40 + pkg-config 41 + scdoc 42 + wayland 43 + ]; 21 44 22 45 buildInputs = [ 23 - wlroots wayland wayland-protocols pixman libxkbcommon cairo 24 - pango fontconfig pandoc systemd 46 + cairo 47 + fontconfig 48 + libxkbcommon 25 49 mesa # for libEGL headers 50 + pango 51 + pixman 52 + systemd 53 + wayland 54 + wayland-protocols 55 + wlroots 26 56 ]; 27 57 28 - outputs = [ "out" "contrib" ]; 58 + outputs = [ 59 + "out" 60 + "contrib" 61 + ]; 29 62 30 63 mesonFlags = [ 31 - "-Dxwayland=${lib.boolToString withXwayland}" 32 - "-Dversion_override=${version}" 33 64 "-Dman-pages=true" 65 + "-Dversion_override=${version}" 66 + "-Dxwayland=${lib.boolToString withXwayland}" 34 67 ]; 68 + 69 + postPatch = '' 70 + sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c 71 + ''; 35 72 36 73 postInstall = '' 37 74 mkdir -p $contrib/share/cagebreak
+1 -3
pkgs/top-level/all-packages.nix
··· 31281 31281 31282 31282 bottom = callPackage ../tools/system/bottom {}; 31283 31283 31284 - cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { 31285 - wlroots = wlroots_0_12; 31286 - }; 31284 + cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { }; 31287 31285 31288 31286 psftools = callPackage ../os-specific/linux/psftools {}; 31289 31287