5 files changed, 45 insertions, 43 deletions
diff --git a/pkgs/arcanist/default.nix b/pkgs/arcanist/default.nix
index 1ed7b50..9cdf8ed 100644
--- a/pkgs/arcanist/default.nix
+++ b/pkgs/arcanist/default.nix
@@ -1,31 +1,60 @@
-{pkgs}:
-pkgs.stdenvNoCC.mkDerivation rec {
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeWrapper,
+  php82,
+  python3,
+  git,
+  diffutils,
+}:
+stdenv.mkDerivation rec {
   pname = "arcanist";
-  version = "2025.18";
+  version = "2025.51";
 
-  src = pkgs.fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "phorgeit";
     repo = "arcanist";
     rev = version;
-    hash = "sha256-yiHLMcgszV9jP/8qb9X/t9Vfm3Ad7DpU55cafWPPQHY=";
+    hash = "sha256-muqNbQBLDOLhzVSF7vTckhb6ouIcj6tHR20CFsgv9bQ=";
   };
 
-  buildInputs = with pkgs; [
+  nativeBuildInputs = [makeWrapper];
+
+  dontBuild = true;
+
+  buildInputs = [
     php82
     python3
-  ];
-
-  propagatedInputs = with pkgs; [
     git
     diffutils
   ];
 
+  configurePhase = ''
+    runHook preConfigure
+
+    patchShebangs .
+
+    runHook postConfigure
+  '';
+
   installPhase = ''
-    mkdir -p $out/share/php/${pname}
-    mkdir -p $out/bin
-    cp -a * $out/share/php/${pname}
-    patchShebangs $out/share/php/${pname}
-    ln -s $out/share/php/${pname}/bin/arc $out/bin/arc
-    ln -sf ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt $out/share/php/${pname}/resources/ssl/default.pem
+    runHook preInstall
+    mkdir -p $out/share/php/arcanist $out/bin
+
+    cp --target-directory=$out/share/php/arcanist --recursive \
+      bin externals resources scripts src support
+
+    makeWrapper $out/share/php/arcanist/bin/arc $out/bin/arc \
+      --inherit-argv0 \
+      --chdir $out/share/php/arcanist \
+      --prefix PATH : ${lib.makeBinPath buildInputs}
+
+    makeWrapper $out/share/php/arcanist/bin/phage $out/bin/phage \
+      --inherit-argv0 \
+      --chdir $out/share/php/arcanist \
+      --prefix PATH : ${lib.makeBinPath buildInputs}
+
+    runHook postInstall
   '';
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 2187e6f..f2bd7c6 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -10,18 +10,11 @@
         ../options.nix
       ];
     }).config;
-in rec {
+in {
   arcanist = pkgs.callPackage ./arcanist {};
   astal = pkgs.callPackage ./astal {
     inherit inputs options;
   };
   libfprint-2-tod1-vfs0090 = pkgs.callPackage ./libfprint-2-tod1-vfs0090 {};
   solaar-udev-rules = pkgs.callPackage ./solaar-udev-rules {};
-  wine-wow-yabridge = pkgs.callPackage ./wine-wow-yabridge {};
-  yabridge = pkgs.callPackage ./yabridge {
-    wine = wine-wow-yabridge;
-  };
-  yabridgectl = pkgs.callPackage ./yabridgectl {
-    wine = wine-wow-yabridge;
-  };
 }
diff --git a/pkgs/wine-wow-yabridge/default.nix b/pkgs/wine-wow-yabridge/default.nix
deleted file mode 100644
index f3346a3..0000000
--- a/pkgs/wine-wow-yabridge/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{wineWowPackages}:
-wineWowPackages.yabridge.overrideAttrs (finalAttrs: {
-  NIX_CFLAGS_COMPILE =
-    (finalAttrs.NIX_CFLAGS_COMPILE or "")
-    + "-std=gnu17";
-})
diff --git a/pkgs/yabridge/default.nix b/pkgs/yabridge/default.nix
deleted file mode 100644
index 97a49db..0000000
--- a/pkgs/yabridge/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  yabridge,
-  wine,
-}:
-yabridge.override {
-  inherit wine;
-}
diff --git a/pkgs/yabridgectl/default.nix b/pkgs/yabridgectl/default.nix
deleted file mode 100644
index 4f3e7a8..0000000
--- a/pkgs/yabridgectl/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  yabridgectl,
-  wine,
-}:
-yabridgectl.override {
-  inherit wine;
-}