From 89cbfe02cee359e4a4f4cf548184f10cfca5bc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Apr 2025 01:14:42 +0200 Subject: [PATCH] hoarder: don't set phases, don't overwrite fixupPhase, minor cleanups Setting phases should only done by lower level functions or wrappers around mkDerivation, not packages. Overwritting fixupPhase can break some things similar to patchPhase. It should generally not be overwritten in packages. --- pkgs/by-name/ho/hoarder/package.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ho/hoarder/package.nix b/pkgs/by-name/ho/hoarder/package.nix index f995ce22112a..bd8dd0a2862d 100644 --- a/pkgs/by-name/ho/hoarder/package.nix +++ b/pkgs/by-name/ho/hoarder/package.nix @@ -46,14 +46,10 @@ stdenv.mkDerivation (finalAttrs: { # We need to pass the patched source code, so pnpm sees the patched version src = stdenv.mkDerivation { name = "${finalAttrs.pname}-patched-source"; - phases = [ - "unpackPhase" - "patchPhase" - "installPhase" - ]; - src = finalAttrs.src; - patches = finalAttrs.patches; - installPhase = "cp -pr --reflink=auto -- . $out"; + inherit (finalAttrs) src patches; + installPhase = '' + cp -pr --reflink=auto -- . $out + ''; }; hash = "sha256-FzQPBIwe7OQ1KHaMtWaFe+RI+pXko5Ly11/jOmYSuFA="; @@ -121,16 +117,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - fixupPhase = '' - runHook preFixup - + postFixup = '' # Remove large dependencies that are not necessary during runtime rm -rf $out/lib/hoarder/node_modules/{@next,next,@swc,react-native,monaco-editor,faker,@typescript-eslint,@microsoft,@typescript-eslint,pdfjs-dist} # Remove broken symlinks find $out -type l ! -exec test -e {} \; -delete - - runHook postFixup ''; meta = {