From 963513e6540cb5ef85c1d6410bc7cdd937f95bdb Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sat, 20 Feb 2021 11:30:47 -0800 Subject: [PATCH 1/2] Fix tzdata cross-compilation --- pkgs/data/misc/tzdata/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 82dd336e5e5..795c5cb681c 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -42,10 +42,11 @@ 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=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic + make $makeFlags cc=cc AR=ar zic mv zic zic-native mv zic.o.orig zic.o mv zic.orig zic From acde9a01a3f5cd12b769385880bab90281ab8361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Feb 2021 07:30:48 +0000 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Sandro --- pkgs/data/misc/tzdata/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 795c5cb681c..a2db4d0d968 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -42,10 +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 + # NOTE: in cross-compilation scenarios, this is built for the build platform. make $makeFlags cc=cc AR=ar zic mv zic zic-native mv zic.o.orig zic.o