From 657a0becc4ebb3d4648dff8e916def7b240301a2 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 19 Aug 2025 05:55:55 -0700 Subject: [PATCH] gogh: fix dependencies Ensure `gogh` works in `nix-shell --pure` --- pkgs/by-name/go/gogh/package.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/go/gogh/package.nix b/pkgs/by-name/go/gogh/package.nix index e33a87955f32..be3588332e8d 100644 --- a/pkgs/by-name/go/gogh/package.nix +++ b/pkgs/by-name/go/gogh/package.nix @@ -2,11 +2,12 @@ lib, stdenvNoCC, fetchFromGitHub, - makeWrapper, + makeBinaryWrapper, ncurses, bashNonInteractive, python3, rustpython, + ps, nix-update-script, }: @@ -49,14 +50,21 @@ stdenvNoCC.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; + + propagatedUserEnvPkgs = [ + bashNonInteractive + rustpython + ncurses + ps + ]; installPhase = '' runHook preInstall mkdir --parents $out/lib cp --recursive {*.py,apply-colors.sh,installs,themes} $out/lib - install -Dm755 gogh.sh $out/bin/${finalAttrs.meta.mainProgram} + install -D gogh.sh $out/bin/${finalAttrs.meta.mainProgram} runHook postInstall ''; @@ -64,9 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { postInstall = '' wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ --set SCRIPT_PATH "$out/lib" \ - --prefix PATH : "${lib.getBin bashNonInteractive}/bin" \ - --prefix PATH : "${lib.getBin rustpython}/bin" \ - --prefix PATH : "${lib.getBin ncurses}/bin" \ + --suffix PATH : "${lib.makeBinPath finalAttrs.propagatedUserEnvPkgs}" \ --prefix PATH : "${pythonEnv}/bin" \ --prefix PYTHONPATH : "${pythonEnv}/${pythonEnv.sitePackages}" '';