Skip to content

Commit 185b40e

Browse files
committed
Fix for building iserv-proxy
1 parent f01d23c commit 185b40e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

overlays/haskell.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,8 @@ final: prev: {
656656
then hsPkgs.${to-key by-id.${d}}
657657
else hsPkgs.${to-key by-id.${d}}.components.sublibs.${final.lib.removePrefix "lib:" by-id.${d}.component-name};
658658
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};
660661
getComponents = cabal2nixComponents: hsPkgs: p:
661662
let
662663
components = p.components or { ${p.component-name or "lib"} = { inherit (p) depends exe-depends; }; };

0 commit comments

Comments
 (0)