Merge pull request #331623 from emilazy/push-yxttoylpkomv

{ lib, stdenv, fetchFromGitHub

, substituteAll

, meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper

, wlroots, wayland, wayland-protocols, pixman, libxkbcommon, xcbutilwm

, systemd, libGL, libX11, mesa

stdenv.mkDerivation rec {

  pname = "cage";

  version = "0.1.5";

  version = "0.1.5-unstable-2024-07-29";

  src = fetchFromGitHub {

    owner = "Hjdskes";

    owner = "cage-kiosk";

    repo = "cage";

    rev = "v${version}";

    hash = "sha256-Suq14YRw/MReDRvO/TQqjpZvpzAEDnHUyVbQj0BPT4c=";

    rev = "d3fb99d6654325ec46277cfdb589f89316bed701";

    hash = "sha256-WP0rWO9Wbs/09wTY8IlIUybnVUnwiNdXD9JgsoVG4rM=";

  };

  patches = [

    # TODO: Remove on next stable release.

    (substituteAll {

      src = ./inject-git-commit.patch;

      gitCommit = lib.substring 0 7 src.rev;

      gitBranch = "master";

    })

  ];

  depsBuildBuild = [

    pkg-config

  ];

    systemd libGL libX11

  ];

  mesonFlags = [ "-Dxwayland=${lib.boolToString (xwayland != null)}" ];

  postFixup = lib.optionalString (xwayland != null) ''

  postFixup = lib.optionalString wlroots.enableXWayland ''

    wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin"

  '';

diff --git a/meson.build b/meson.build

index 4c0cbe280f..d4479741c8 100644

--- a/meson.build

+++ b/meson.build

@@ -68,14 +68,12 @@

 version = '@0@'.format(meson.project_version())

 git = find_program('git', native: true, required: false)

-if git.found()

-  git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false)

-  git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)

-  if git_commit.returncode() == 0 and git_branch.returncode() == 0

+if true

+  if true

     version = '@0@-@1@ (branch \'@2@\')'.format(

       meson.project_version(),

-      git_commit.stdout().strip(),

-      git_branch.stdout().strip(),

+      '@gitCommit@'.strip(),

+      '@gitBranch@'.strip(),

     )

   endif

 endif

, mesa

, xorg

, libpng

, ffmpeg_4

, ffmpeg

, hwdata

, seatd

in

rec {

  wlroots_0_16 = generic {

    version = "0.16.2";

    hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ=";

    postPatch = ''

      substituteInPlace backend/drm/meson.build \

        --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/

    '';

    extraBuildInputs = [

      ffmpeg_4

    ];

  };

  wlroots_0_17 = generic {

    version = "0.17.4";

    hash = "sha256-AzmXf+HMX/6VAr0LpfHwfmDB9dRrrLQHt7l35K98MVo=";

  wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17

  wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29

  wlroots_0_15 = throw "'wlroots_0_15' has been removed in favor of newer versions"; # Added 2024-03-28

  wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14

  wlroots = wlroots_0_18; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release

  wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10

  wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10

  cardo = callPackage ../data/fonts/cardo { };

  cage = callPackage ../applications/window-managers/cage {

    wlroots = wlroots_0_16;

    wlroots = wlroots_0_17;

  };

  calf = callPackage ../applications/audio/calf {

  super-productivity = callPackage ../applications/office/super-productivity { };

  inherit (callPackages ../development/libraries/wlroots {})

    wlroots_0_16

    wlroots_0_17

    wlroots_0_18;