Commit 9d6d6b75 authored by Valentin Reis's avatar Valentin Reis
Browse files

env var fixes.

parent 4c86e9c6
Pipeline #5182 passed with stage
in 28 seconds
...@@ -26,7 +26,8 @@ in rec ...@@ -26,7 +26,8 @@ in rec
argotk = hpkgs.argotk.overrideAttrs (old:{ argotk = hpkgs.argotk.overrideAttrs (old:{
installPhase = old.installPhase + '' installPhase = old.installPhase + ''
mkdir $out/share/ mkdir $out/share/
ARGONIX_SHARE=/tmp $out/bin/argotk --bash-completion-script argotk > $out/share/argotk.sh ARGOTK_SHARE=share $out/bin/argotk --bash-completion-script argotk > $out/share/argotk.sh
cp -r share/* $out/share/
''; '';
}); });
...@@ -38,7 +39,7 @@ in rec ...@@ -38,7 +39,7 @@ in rec
preCommit = pkgs.mkShell { preCommit = pkgs.mkShell {
name = "shake"; name = "shake";
ARGONIX_SHARE = "/tmp"; ARGOTK_SHARE = "${argotk}/share";
buildInputs = [ buildInputs = [
(pkgs.haskellPackages.ghcWithPackages (p: with p; [ (pkgs.haskellPackages.ghcWithPackages (p: with p; [
argotk argotk
......
...@@ -312,7 +312,7 @@ clean StackArgs {..} = cleanLeftovers workingDirectory ...@@ -312,7 +312,7 @@ clean StackArgs {..} = cleanLeftovers workingDirectory
main :: IO () main :: IO ()
main = do main = do
argonixShare <- getEnv "ARGONIX_SHARE" argonixShare <- getEnv "ARGOTK_SHARE"
let a = def { shareDir = ShareDir $ decodeString argonixShare } let a = def { shareDir = ShareDir $ decodeString argonixShare }
turtle <- execParser (info (opts a <**> helper) idm) turtle <- execParser (info (opts a <**> helper) idm)
sh turtle sh turtle
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment