Merge pull request #122059 from AndersonTorres/quick-patches

cagebreak: 1.7.0 -> 1.7.1

authored by

Anderson Torres and committed by
GitHub
87f9307b 4f64f6d8

+9 -15
+9 -15
pkgs/applications/window-managers/cagebreak/default.nix
··· 9 9 , meson 10 10 , ninja 11 11 , nixosTests 12 - , pandoc 13 12 , pango 14 13 , pixman 15 14 , pkg-config ··· 23 22 24 23 stdenv.mkDerivation rec { 25 24 pname = "cagebreak"; 26 - version = "1.7.0"; 25 + version = "1.7.1"; 27 26 28 27 src = fetchFromGitHub { 29 28 owner = "project-repo"; 30 29 repo = pname; 31 30 rev = version; 32 - hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI="; 31 + hash = "sha256-1IztedN5/I/4TDKHLJ26fSrDsvJ5QAr+cbzS2PQITDE="; 33 32 }; 34 33 35 34 nativeBuildInputs = [ 36 35 makeWrapper 37 36 meson 38 37 ninja 39 - pandoc 40 38 pkg-config 41 39 scdoc 42 40 wayland ··· 55 53 wlroots 56 54 ]; 57 55 58 - outputs = [ 59 - "out" 60 - "contrib" 61 - ]; 62 - 63 56 mesonFlags = [ 64 57 "-Dman-pages=true" 65 58 "-Dversion_override=${version}" 66 59 "-Dxwayland=${lib.boolToString withXwayland}" 67 60 ]; 68 61 62 + # TODO: investigate why is this happening 69 63 postPatch = '' 70 64 sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c 71 65 ''; 72 66 73 67 postInstall = '' 74 - mkdir -p $contrib/share/cagebreak 75 - cp $src/examples/config $contrib/share/cagebreak/config 68 + install -d $out/share/cagebreak/ 69 + install -m644 $src/examples/config $out/share/cagebreak/ 76 70 ''; 77 71 78 72 postFixup = lib.optionalString withXwayland '' 79 73 wrapProgram $out/bin/cagebreak --prefix PATH : "${xwayland}/bin" 80 74 ''; 81 - 82 - passthru.tests.basic = nixosTests.cagebreak; 83 75 84 76 meta = with lib; { 85 - description = "A Wayland tiling compositor inspired by ratpoison"; 86 77 homepage = "https://github.com/project-repo/cagebreak"; 78 + description = "A Wayland tiling compositor inspired by ratpoison"; 87 79 license = licenses.mit; 88 - platforms = platforms.linux; 89 80 maintainers = with maintainers; [ berbiche ]; 81 + platforms = platforms.linux; 90 82 }; 83 + 84 + passthru.tests.basic = nixosTests.cagebreak; 91 85 }