diff options
| author | Someone Serge <sergei.kozlukov@aalto.fi> | 2024-03-26 16:22:42 +0000 |
|---|---|---|
| committer | Someone <newkozlukov@gmail.com> | 2024-03-28 07:48:27 +0000 |
| commit | e9f17dc3bf0da76c8b35130f9ca2fda5246c418e (patch) | |
| tree | c115996e9940c64c78742102fe1419a42e0f35dc | |
| parent | 22a462cc1f69873f7d4c6d0201bd93478afa2ecb (diff) | |
nix: .#windows: proper cross-compilation set-up
Take all dependencies from the cross stage, rather tha only stdenv
| -rw-r--r-- | flake.nix | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -145,6 +145,7 @@ # 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; }; }; @@ -155,9 +156,7 @@ { 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; }; |