From ff2f22cfe7fccca8a1e86780b2fff336f900ab2e Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 12 Mar 2025 22:56:26 -0400 Subject: [PATCH] packages(numen): prefer env over export --- packages/numen.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/numen.nix b/packages/numen.nix index db3318cf..20b988d5 100644 --- a/packages/numen.nix +++ b/packages/numen.nix @@ -81,11 +81,6 @@ buildGoModule rec { vendorHash = "sha256-Y3CbAnIK+gEcUfll9IlEGZE/s3wxdhAmTJkj9zlAtoQ="; - preBuild = '' - export CGO_CFLAGS="-I${vosk-bin}/include" - export CGO_LDFLAGS="-L${vosk-bin}/lib" - ''; - nativeBuildInputs = [ makeWrapper scdoc @@ -99,6 +94,15 @@ buildGoModule rec { "-X main.DefaultPhrasesDir=${placeholder "out"}/etc/numen/phrases" ]; + env = { + CGO_CFLAGS = "-I${vosk-bin}/include"; + CGO_LDFLAGS = "-L${vosk-bin}/lib"; + NUMEN_SKIP_BINARY = "yes"; + NUMEN_SKIP_CHECKS = "yes"; + NUMEN_DEFAULT_PHRASES_DIR = "/etc/numen/phrases"; + NUMEN_SCRIPTS_DIR = "/etc/numen/scripts"; + }; + patchPhase = '' runHook prePatch @@ -131,11 +135,6 @@ buildGoModule rec { install -Dm755 $GOPATH/bin/numen -t $out/bin - export NUMEN_SKIP_BINARY=yes - export NUMEN_SKIP_CHECKS=yes - export NUMEN_DEFAULT_PHRASES_DIR=/etc/numen/phrases - export NUMEN_SCRIPTS_DIR=/etc/numen/scripts - for file in ./scripts/*; do cp "$file" "$out/bin/numen-$(basename $file)" done