Skip to content

Commit c78f2b0

Browse files
SomeoneSergehodlen
authored andcommitted
nix: .#windows: proper cross-compilation set-up
Take all dependencies from the cross stage, rather tha only stdenv
1 parent c0ece0d commit c78f2b0

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

flake.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
# the same path you would with an overlay.
146146
legacyPackages = {
147147
llamaPackages = pkgs.callPackage .devops/nix/scope.nix { inherit llamaVersion; };
148+
llamaPackagesWindows = pkgs.pkgsCross.mingwW64.callPackage .devops/nix/scope.nix { inherit llamaVersion; };
148149
llamaPackagesCuda = pkgsCuda.callPackage .devops/nix/scope.nix { inherit llamaVersion; };
149150
llamaPackagesRocm = pkgsRocm.callPackage .devops/nix/scope.nix { inherit llamaVersion; };
150151
};
@@ -155,9 +156,7 @@
155156
{
156157
default = config.legacyPackages.llamaPackages.llama-cpp;
157158
vulkan = config.packages.default.override { useVulkan = true; };
158-
windows = config.legacyPackages.llamaPackages.llama-cpp.override {
159-
stdenv = pkgs.pkgsCross.mingwW64.stdenv;
160-
};
159+
windows = config.legacyPackages.llamaPackagesWindows.llama-cpp;
161160
}
162161
// lib.optionalAttrs pkgs.stdenv.isLinux {
163162
opencl = config.packages.default.override { useOpenCL = true; };

0 commit comments

Comments
 (0)