File tree Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -656,7 +656,8 @@ final: prev: {
656
656
then hsPkgs . ${ to-key by-id . ${ d } }
657
657
else hsPkgs . ${ to-key by-id . ${ d } } . components . sublibs . ${ final . lib . removePrefix "lib:" by-id . ${ d } . component-name } ;
658
658
lookupExeDependency = hsPkgs : d :
659
- hsPkgs . pkgsBuildBuild . ${ to-key by-id . ${ d } } . components . exes . ${ final . lib . removePrefix "exe:" by-id . ${ d } . component-name } ;
659
+ # Try to lookup by ID, but if that fails use the name (currently a different plan is used by pkgsBuildBuild when cross compiling)
660
+ ( hsPkgs . pkgsBuildBuild . ${ to-key by-id . ${ d } } or hsPkgs . pkgsBuildBuild . ${ by-id . ${ d } . pkg-name } ) . components . exes . ${ final . lib . removePrefix "exe:" by-id . ${ d } . component-name } ;
660
661
getComponents = cabal2nixComponents : hsPkgs : p :
661
662
let
662
663
components = p . components or { ${ p . component-name or "lib" } = { inherit ( p ) depends exe-depends ; } ; } ;
You can’t perform that action at this time.
0 commit comments