From a997afb7daeb0e0ec07c7cc1b34a80edac286ec8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 20 Jun 2020 15:21:19 +0000 Subject: [PATCH] zstd: Fix cross CMake is a build-time dep, so we need to override it with `buildPackages`, explicitly. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ae58bff225..14a494a164f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7929,8 +7929,8 @@ in zssh = callPackage ../tools/networking/zssh { }; zstd = callPackage ../tools/compression/zstd { - cmake = cmake.override { - libarchive = libarchive.override { zstd = null; }; + cmake = buildPackages.cmake.override { + libarchive = buildPackages.libarchive.override { zstd = null; }; }; };