]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
nix: .#windows: proper cross-compilation set-up
authorSomeone Serge <redacted>
Tue, 26 Mar 2024 16:22:42 +0000 (16:22 +0000)
committerSomeone <redacted>
Thu, 28 Mar 2024 07:48:27 +0000 (07:48 +0000)
Take all dependencies from the cross stage, rather tha only stdenv

flake.nix

index cdce3e0a9f5294f8d7cb193ebf934dcaa847a933..9cd3756e53e51f57aea517c7b7063375ae8227ec 100644 (file)
--- a/flake.nix
+++ b/flake.nix
             # the same path you would with an overlay.
             legacyPackages = {
               llamaPackages = pkgs.callPackage .devops/nix/scope.nix { inherit llamaVersion; };
+              llamaPackagesWindows = pkgs.pkgsCross.mingwW64.callPackage .devops/nix/scope.nix { inherit llamaVersion; };
               llamaPackagesCuda = pkgsCuda.callPackage .devops/nix/scope.nix { inherit llamaVersion; };
               llamaPackagesRocm = pkgsRocm.callPackage .devops/nix/scope.nix { inherit llamaVersion; };
             };
               {
                 default = config.legacyPackages.llamaPackages.llama-cpp;
                 vulkan = config.packages.default.override { useVulkan = true; };
-                windows = config.legacyPackages.llamaPackages.llama-cpp.override {
-                  stdenv = pkgs.pkgsCross.mingwW64.stdenv;
-                };
+                windows = config.legacyPackages.llamaPackagesWindows.llama-cpp;
               }
               // lib.optionalAttrs pkgs.stdenv.isLinux {
                 opencl = config.packages.default.override { useOpenCL = true; };