File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -682,7 +682,7 @@ final: prev: {
682
682
} ;
683
683
} ;
684
684
callProjectResults = callCabalProjectToNix config ;
685
- nixFilesDir = callProjectResults . projectNix + callProjectResults . src . origSubDir ;
685
+ nixFilesDir = callProjectResults . projectNix + callProjectResults . src . origSubDir or "" ;
686
686
plan-pkgs = if ! builtins . pathExists ( callProjectResults . projectNix + "/plan.json" )
687
687
then
688
688
# TODO remove this once all the materialized files are updated
@@ -732,7 +732,7 @@ final: prev: {
732
732
in builtins . removeAttrs cabal2nix [ "src" ] // final . lib . optionalAttrs ( p ? pkg-src-sha256 ) {
733
733
sha256 = p . pkg-src-sha256 ;
734
734
} // 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 ;
736
736
} // {
737
737
flags = p . flags ;
738
738
components = getComponents cabal2nix . components hsPkgs p ;
You can’t perform that action at this time.
0 commit comments