public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix tzdata cross-compilation" 

This reverts commit 963513e654.
A better solution is a65208ca8e.
This commit is contained in:
Robert Schütz 2021-02-26 10:56:10 +01:00
parent 26c9976e50
commit 109cbc400f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/data/misc/tzdata/default.nix
View File

@ -42,11 +42,10 @@ stdenv.mkDerivation rec {
installFlags = [ "ZIC=./zic-native" ]; installFlags = [ "ZIC=./zic-native" ];
# NOTE: in cross-compilation scenarios, this is built for the build platform.
preInstall = '' preInstall = ''
mv zic.o zic.o.orig mv zic.o zic.o.orig
mv zic zic.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 zic-native
mv zic.o.orig zic.o mv zic.o.orig zic.o
mv zic.orig zic mv zic.orig zic