cage: modernize

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";
   };
-}
+})

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;