Unverified Commit 1b1d7e93 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #121652 from AndersonTorres/quick-patches 

cagebreak: 1.6.0 -> 1.7.0
parents 0e2936eb 1c516ffb

pkgs/applications/window-managers/cagebreak/default.nix

+51 −14
Original line number Diff line number Diff line 
{ 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

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -31281,9 +31281,7 @@ in 














  bottom = callPackage ../tools/system/bottom {};



























  cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {













    wlroots = wlroots_0_12;













  };













  cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { };





























  psftools = callPackage ../os-specific/linux/psftools {};