6 files changed, 58 insertions, 18 deletions
diff --git a/pkgs/arcanist/default.nix b/pkgs/arcanist/default.nix
index 2660589..9cdf8ed 100644
--- a/pkgs/arcanist/default.nix
+++ b/pkgs/arcanist/default.nix
@@ -1,34 +1,60 @@
 {
   lib,
-  pkgs,
+  stdenv,
+  fetchFromGitHub,
+  makeWrapper,
+  php82,
+  python3,
+  git,
+  diffutils,
 }:
-pkgs.stdenvNoCC.mkDerivation rec {
+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/astal/builder.nix b/pkgs/astal/builder.nix
index c48eaf5..db102bd 100644
--- a/pkgs/astal/builder.nix
+++ b/pkgs/astal/builder.nix
@@ -3,7 +3,7 @@
   astal,
   name,
   src,
-  extraLuaPackages ? (ps: []),
+  extraLuaPackages ? (_: []),
   extraPackages ? [],
 }: let
   lua = pkgs.lua.withPackages (ps:
diff --git a/pkgs/astal/default.nix b/pkgs/astal/default.nix
index 6317f3b..dc8f2a7 100644
--- a/pkgs/astal/default.nix
+++ b/pkgs/astal/default.nix
@@ -5,8 +5,7 @@
   options,
   ...
 }: let
-  runCommand = pkgs.runCommand;
-  dart-sass = pkgs.dart-sass;
+  inherit (pkgs) runCommand dart-sass;
 
   apkgs = inputs.astal.packages.${stdenv.hostPlatform.system};
   scss = "${dart-sass}/bin/sass";
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 1069328..f2bd7c6 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -16,4 +16,5 @@ in {
     inherit inputs options;
   };
   libfprint-2-tod1-vfs0090 = pkgs.callPackage ./libfprint-2-tod1-vfs0090 {};
+  solaar-udev-rules = pkgs.callPackage ./solaar-udev-rules {};
 }
diff --git a/hosts/shinji/42-logitech-unify-permissions.rules b/pkgs/solaar-udev-rules/42-logitech-unify-permissions.rules
index e52c9b0..e52c9b0 100644
--- a/hosts/shinji/42-logitech-unify-permissions.rules
+++ b/pkgs/solaar-udev-rules/42-logitech-unify-permissions.rules
diff --git a/pkgs/solaar-udev-rules/default.nix b/pkgs/solaar-udev-rules/default.nix
new file mode 100644
index 0000000..a4148a0
--- /dev/null
+++ b/pkgs/solaar-udev-rules/default.nix
@@ -0,0 +1,14 @@
+{stdenv}:
+stdenv.mkDerivation {
+  name = "solaar-udev-rules";
+
+  src = ./.;
+
+  dontBuild = true;
+  dontConfigure = true;
+
+  installPhase = ''
+    mkdir -p $out/etc/udev/rules.d
+    cp 42-logitech-unify-permissions.rules $out/etc/udev/rules.d
+  '';
+}