From 3ced20c6c25715a421745bf137d4e7fdf0c7e2ff Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 20:25:34 -0700
Subject: [PATCH 1/2] cage: modernize

---
 .../window-managers/cage/default.nix          | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix
index adfa29198ed4..d11cb43ba4fd 100644
--- a/pkgs/applications/window-managers/cage/default.nix
+++ b/pkgs/applications/window-managers/cage/default.nix
@@ -8,7 +8,7 @@
   wayland-scanner,
   scdoc,
   makeWrapper,
-  wlroots,
+  wlroots_0_18,
   wayland,
   wayland-protocols,
   pixman,
@@ -21,14 +21,14 @@
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cage";
   version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "cage-kiosk";
     repo = "cage";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-2SFtz62z0EF8cpFTC6wGi125MD4a5mkXqP/C+7fH+3g=";
   };
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    wlroots
+    wlroots_0_18
     wayland
     wayland-protocols
     pixman
@@ -57,19 +57,19 @@ stdenv.mkDerivation rec {
     libX11
   ];
 
-  postFixup = lib.optionalString wlroots.enableXWayland ''
+  postFixup = lib.optionalString wlroots_0_18.enableXWayland ''
     wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin"
   '';
 
   # Tests Cage using the NixOS module by launching xterm:
   passthru.tests.basic-nixos-module-functionality = nixosTests.cage;
 
-  meta = with lib; {
+  meta = {
     description = "Wayland kiosk that runs a single, maximized application";
     homepage = "https://www.hjdskes.nl/projects/cage/";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ primeos ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ primeos ];
     mainProgram = "cage";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 548a6291147d..d006489cf50e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13822,9 +13822,7 @@ with pkgs;
 
   breezy = with python3Packages; toPythonApplication breezy;
 
-  cage = callPackage ../applications/window-managers/cage {
-    wlroots = wlroots_0_18;
-  };
+  cage = callPackage ../applications/window-managers/cage { };
 
   calf = callPackage ../applications/audio/calf {
     inherit (gnome2) libglade;

From 9128335d3449e45027bb2c564eed2c04d6bc20be Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 20:26:09 -0700
Subject: [PATCH 2/2] cage: move to by-name

---
 .../cage/default.nix => by-name/ca/cage/package.nix}            | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/cage/default.nix => by-name/ca/cage/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/by-name/ca/cage/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/cage/default.nix
rename to pkgs/by-name/ca/cage/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d006489cf50e..df208ae32c00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13822,8 +13822,6 @@ with pkgs;
 
   breezy = with python3Packages; toPythonApplication breezy;
 
-  cage = callPackage ../applications/window-managers/cage { };
-
   calf = callPackage ../applications/audio/calf {
     inherit (gnome2) libglade;
   };