Skip to content

Commit 19dbbc3

Browse files
committed
Tried recursive nix
1 parent cad892a commit 19dbbc3

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

nix-tools/static/project.nix

-13
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,7 @@ let
2929
};
3030

3131

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-
4232
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.
4533
packages.nix-tools.components.exes = {
4634
cabal-name.dontStrip = false;
4735
cabal-to-nix.dontStrip = false;
@@ -79,7 +67,6 @@ let
7967

8068
modules = [
8169
apply-hnix-patches
82-
apply-workaround-for-ghc94-and-above
8370
apply-dontStrip-to-nix-tools
8471
add-static-libs-to-darwin
8572
];

nix-tools/static/zipped.nix

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,24 @@ let
4040
zippedToolsNoIfdFor = fragment-name:
4141
let
4242
stringifyInputs = inputs: map (x: "${x}") (builtins.attrValues inputs);
43+
44+
fragment-drv = "static-nix-tools-outputs.hydraJobs.${pkgs.hostPlatform.system}.zipped.${fragment-name}";
4345
in
4446
pkgs.runCommand "${pkgs.hostPlatform.system}-all-nix-tools" {
4547
requiredSystemFeatures = [ "recursive-nix" ];
4648
nativeBuildInputs =
4749
[ pkgs.nix pkgs.gitMinimal ]
4850
++ stringifyInputs inputs
4951
++ stringifyInputs inputs.haskellNix.inputs;
50-
# ++ stringifyInputs inputs.iohkNix.inputs;
5152
} ''
5253
export HOME=$(mktemp -d)
5354
mkdir $out
54-
cp $(nix --offline --extra-experimental-features "flakes nix-command" \
55+
cp $(nix --offline --extra-experimental-features "flakes nix-command recursive-nix" \
5556
build --accept-flake-config --no-link --print-out-paths \
5657
--system ${pkgs.hostPlatform.system} \
57-
${../.}#${fragment-name})/*.zip $out/
58+
${../.}#${fragment-drv})/*.zip $out/
5859
'';
59-
60-
60+
6161
zippedToolsForDarwin = makeZippedTools {
6262
customPkgs = pkgs;
6363
clearStripDebugFlags = true;

0 commit comments

Comments
 (0)