pyrox.dev
lol
Fix buildStackProject in nix-build
authored by
Will Fancher
and committed by
Domen Kožar
daf78689
a7d25d4b
+8
-6
+8
-6
pkgs/development/haskell-modules/generic-stack-builder.nix
+8
-6
pkgs/development/haskell-modules/generic-stack-builder.nix
···
1
-
{ stdenv, ghc, pkgconfig, glibcLocales, cacert }@depArgs:
1
+
{ stdenv, ghc, pkgconfig, glibcLocales, cacert, stack }@depArgs:
2
2
3
3
with stdenv.lib;
4
4
···
6
6
, extraArgs ? []
7
7
, LD_LIBRARY_PATH ? []
8
8
, ghc ? depArgs.ghc
9
+
, stack ? depArgs.stack
9
10
, ...
10
11
}@args:
11
12
12
-
stdenv.mkDerivation (args // {
13
+
let stackCmd = "stack --internal-re-exec-version=${stack.version}";
14
+
in stdenv.mkDerivation (args // {
13
15
14
16
buildInputs =
15
17
buildInputs ++
16
18
optional stdenv.isLinux glibcLocales ++
17
-
[ ghc pkgconfig ];
19
+
[ ghc pkgconfig stack ];
18
20
19
21
STACK_PLATFORM_VARIANT="nix";
20
22
STACK_IN_NIX_SHELL=1;
···
39
41
export STACK_ROOT=$NIX_BUILD_TOP/.stack
40
42
'';
41
43
42
-
buildPhase = args.buildPhase or "stack build";
44
+
buildPhase = args.buildPhase or "${stackCmd} build";
43
45
44
-
checkPhase = args.checkPhase or "stack test";
46
+
checkPhase = args.checkPhase or "${stackCmd} test";
45
47
46
48
doCheck = args.doCheck or true;
47
49
48
50
installPhase = args.installPhase or ''
49
-
stack --local-bin-path=$out/bin build --copy-bins
51
+
${stackCmd} --local-bin-path=$out/bin build --copy-bins
50
52
'';
51
53
})