e9a9354 · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Look for DLLs in /bin directory of pkgconfig deps (#1422)

e9a9354Hamish Mackenzie5 years ago

builder/make-config-files.nix+4−1

@@ -82,7 +82,10 @@ let

83 ${lib.concatStringsSep "\n" (lib.mapAttrsToList flagsAndConfig {

84 "extra-lib-dirs" = map (p: "${lib.getLib p}/lib") component.libs

85+ # On windows also include `bin` directories that may contain DLLs

85− ++ lib.optionals (stdenv.hostPlatform.isWindows) (map (p: "${lib.getBin p}/bin") component.libs);

86+ ++ lib.optionals (stdenv.hostPlatform.isWindows)

87+ (map (p: "${lib.getBin p}/bin")

88+ (component.libs ++ lib.concatLists component.pkgconfig));

86 "extra-include-dirs" = map (p: "${lib.getDev p}/include") component.libs;

89 "extra-include-dirs" = map (p: "${lib.getDev p}/include") component.libs;

87 "extra-framework-dirs" = map (p: "${p}/Library/Frameworks") component.frameworks;

90 "extra-framework-dirs" = map (p: "${p}/Library/Frameworks") component.frameworks;

88 })}

91 })}

builder/shell-for.nix+1

@@ -96,6 +96,7 @@ let

96 component = {

97 depends = packageInputs;

98 libs = [];

99+ pkgconfig = [];

99 frameworks = [];

100 frameworks = [];

100 doExactConfig = false;

101 doExactConfig = false;

101 };

102 };