From 1f2758af98b3b4b188ce974eb3a207c2a151b662 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sat, 25 Jan 2025 05:25:22 -0500
Subject: [PATCH] phoc: migrate to by-name

---
 .../misc/phoc/default.nix => by-name/ph/phoc/package.nix}     | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc/phoc/default.nix => by-name/ph/phoc/package.nix} (97%)

diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/by-name/ph/phoc/package.nix
similarity index 97%
rename from pkgs/applications/misc/phoc/default.nix
rename to pkgs/by-name/ph/phoc/package.nix
index 19dc0653c753..eb5d3c32b3c5 100644
--- a/pkgs/applications/misc/phoc/default.nix
+++ b/pkgs/by-name/ph/phoc/package.nix
@@ -18,7 +18,7 @@
 , wayland
 , libdrm
 , libxkbcommon
-, wlroots
+, wlroots_0_17
 , xorg
 , directoryListingUpdater
 , nixosTests
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Patch wlroots to remove a check which crashes Phosh.
   # This patch can be found within the phoc source tree.
-  wlroots = wlroots.overrideAttrs (old: {
+  wlroots = wlroots_0_17.overrideAttrs (old: {
     patches = (old.patches or []) ++ [
       (stdenvNoCC.mkDerivation {
         name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5750b99a5dc1..7cb482bc375f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4669,10 +4669,6 @@ with pkgs;
 
   pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { };
 
-  phoc = callPackage ../applications/misc/phoc {
-    wlroots = wlroots_0_17;
-  };
-
   piper-train = callPackage ../tools/audio/piper/train.nix { };
   piper-tts = callPackage ../tools/audio/piper { };