File tree 2 files changed +5
-18
lines changed
2 files changed +5
-18
lines changed Original file line number Diff line number Diff line change 29
29
} ;
30
30
31
31
32
- # Fix compilation with newer ghc versions
33
- apply-workaround-for-ghc94-and-above = { lib , config , ... } :
34
- lib . mkIf ( lib . versionAtLeast config . compiler . version "9.4" ) {
35
- # lib:ghc is a bit annoying in that it comes with it's own build-type:Custom, and then tries
36
- # to call out to all kinds of silly tools that GHC doesn't really provide.
37
- # For this reason, we try to get away without re-installing lib:ghc for now.
38
- reinstallableLibGhc = false ;
39
- } ;
40
-
41
-
42
32
apply-dontStrip-to-nix-tools = {
43
- # This is stupid. We should be able to set dontStrip globally.
44
- # The fact that we can't inherit is bullshit.
45
33
packages . nix-tools . components . exes = {
46
34
cabal-name . dontStrip = false ;
47
35
cabal-to-nix . dontStrip = false ;
79
67
80
68
modules = [
81
69
apply-hnix-patches
82
- apply-workaround-for-ghc94-and-above
83
70
apply-dontStrip-to-nix-tools
84
71
add-static-libs-to-darwin
85
72
] ;
Original file line number Diff line number Diff line change 40
40
zippedToolsNoIfdFor = fragment-name :
41
41
let
42
42
stringifyInputs = inputs : map ( x : "${ x } " ) ( builtins . attrValues inputs ) ;
43
+
44
+ fragment-drv = "static-nix-tools-outputs.hydraJobs.${ pkgs . hostPlatform . system } .zipped.${ fragment-name } " ;
43
45
in
44
46
pkgs . runCommand "${ pkgs . hostPlatform . system } -all-nix-tools" {
45
47
requiredSystemFeatures = [ "recursive-nix" ] ;
46
48
nativeBuildInputs =
47
49
[ pkgs . nix pkgs . gitMinimal ]
48
50
++ stringifyInputs inputs
49
51
++ stringifyInputs inputs . haskellNix . inputs ;
50
- # ++ stringifyInputs inputs.iohkNix.inputs;
51
52
} ''
52
53
export HOME=$(mktemp -d)
53
54
mkdir $out
54
- cp $(nix --offline --extra-experimental-features "flakes nix-command" \
55
+ cp $(nix --offline --extra-experimental-features "flakes nix-command recursive-nix " \
55
56
build --accept-flake-config --no-link --print-out-paths \
56
57
--system ${ pkgs . hostPlatform . system } \
57
- ${ ../. } #${ fragment-name } )/*.zip $out/
58
+ ${ ../. } #${ fragment-drv } )/*.zip $out/
58
59
'' ;
59
-
60
-
60
+
61
61
zippedToolsForDarwin = makeZippedTools {
62
62
customPkgs = pkgs ;
63
63
clearStripDebugFlags = true ;
You can’t perform that action at this time.
0 commit comments