Skip to content

Commit 83db180

Browse files
committed
Fix projects not in sub dir
1 parent db0a77a commit 83db180

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

overlays/haskell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ final: prev: {
682682
};
683683
};
684684
callProjectResults = callCabalProjectToNix config;
685-
nixFilesDir = callProjectResults.projectNix + callProjectResults.src.origSubDir;
685+
nixFilesDir = callProjectResults.projectNix + callProjectResults.src.origSubDir or "";
686686
plan-pkgs = if !builtins.pathExists (callProjectResults.projectNix + "/plan.json")
687687
then
688688
# TODO remove this once all the materialized files are updated
@@ -732,7 +732,7 @@ final: prev: {
732732
in builtins.removeAttrs cabal2nix ["src"] // final.lib.optionalAttrs (p ? pkg-src-sha256) {
733733
sha256 = p.pkg-src-sha256;
734734
} // final.lib.optionalAttrs (p.pkg-src.type or "" == "local") {
735-
src = callProjectResults.src + final.lib.removePrefix "${callProjectResults.src.origSubDir}/." p.pkg-src.path;
735+
src = callProjectResults.src + final.lib.removePrefix "${callProjectResults.src.origSubDir or ""}/." p.pkg-src.path;
736736
} // {
737737
flags = p.flags;
738738
components = getComponents cabal2nix.components hsPkgs p;

0 commit comments

Comments
 (0)