From 109cbc400f4dd472d91f1f7768f42d7faac0cddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Feb 2021 10:56:10 +0100 Subject: [PATCH] Revert "Fix tzdata cross-compilation" This reverts commit 963513e6540cb5ef85c1d6410bc7cdd937f95bdb. A better solution is a65208ca8e593e2478b0848e6b5cbda7530a1707. --- pkgs/data/misc/tzdata/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 795c5cb681c..82dd336e5e5 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -42,11 +42,10 @@ stdenv.mkDerivation rec { installFlags = [ "ZIC=./zic-native" ]; - # NOTE: in cross-compilation scenarios, this is built for the build platform. preInstall = '' mv zic.o zic.o.orig mv zic zic.orig - make $makeFlags cc=cc AR=ar zic + make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic mv zic zic-native mv zic.o.orig zic.o mv zic.orig zic