Skip to content

Commit 57d972e

Browse files
committed
Look for projectArgs.nix
1 parent f414f45 commit 57d972e

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

hix/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ let
103103
chmod +w $FLAKE/flake.nix
104104
fi
105105
if [ "$projectArgs" != "" ]; then
106-
printf %s "$projectArgs" > "$HIX_TMPDIR/default.nix"
106+
printf %s "$projectArgs" > "$HIX_TMPDIR/projectArgs.nix"
107107
fi
108108
nix $cmd "''${args[@]}"
109109
;;

hix/empty-set/default.nix

Lines changed: 0 additions & 1 deletion
This file was deleted.

hix/project/flake.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
66
inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
77
inputs.flake-utils.url = "github:numtide/flake-utils";
8-
inputs.projectArgs.url = "github:input-output-hk/haskell.nix?dir=hix/empty-set";
8+
inputs.projectArgs.url = "github:input-output-hk/empty-flake";
99
inputs.projectArgs.flake = false;
1010
inputs.src.flake = false;
1111
outputs = { self, src, nixpkgs, flake-utils, haskellNix, projectArgs }:
@@ -16,7 +16,10 @@
1616
hixProject =
1717
final.haskell-nix.hix.project ({
1818
inherit src;
19-
} // import projectArgs);
19+
} // (
20+
if builtins.pathExists (projectArgs + "/projectArgs.nix")
21+
then import (projectArgs + "/projectArgs.nix")
22+
else {}));
2023
})
2124
];
2225
pkgs = import nixpkgs { inherit system overlays; inherit (haskellNix) config; };

0 commit comments

Comments
 (0)