Unverified Commit 0dd63d1f authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

cage: 0.1.5-unstable-2024-07-29 -> 0.2.0 (#347010)

parents 8bb93db5 9ddfebc8
Loading
Loading
Loading
Loading
+3 −13
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub
, substituteAll
, meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper
, wlroots, wayland, wayland-protocols, pixman, libxkbcommon, xcbutilwm
, systemd, libGL, libX11, mesa
@@ -9,24 +8,15 @@

stdenv.mkDerivation rec {
  pname = "cage";
  version = "0.1.5-unstable-2024-07-29";
  version = "0.2.0";

  src = fetchFromGitHub {
    owner = "cage-kiosk";
    repo = "cage";
    rev = "d3fb99d6654325ec46277cfdb589f89316bed701";
    hash = "sha256-WP0rWO9Wbs/09wTY8IlIUybnVUnwiNdXD9JgsoVG4rM=";
    rev = "refs/tags/v${version}";
    hash = "sha256-2SFtz62z0EF8cpFTC6wGi125MD4a5mkXqP/C+7fH+3g=";
  };

  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
  ];
+0 −23
Original line number Diff line number Diff line
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
+1 −1
Original line number Diff line number Diff line
@@ -28450,7 +28450,7 @@ with pkgs;
  cardo = callPackage ../data/fonts/cardo { };
  cage = callPackage ../applications/window-managers/cage {
    wlroots = wlroots_0_17;
    wlroots = wlroots_0_18;
  };
  calf = callPackage ../applications/audio/calf {