diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-08-14 07:15:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-14 07:15:01 +0100 |
| commit | cf5f02b4bb52d3df1d1d8a4875155d4f077e8f56 (patch) | |
| tree | a5e3fd024c281d0325c7cb74ed5741c7cd42d369 | |
| parent | b5facab0482f438aea96558205bb1e2fa372836c (diff) | |
| parent | d0887921b3ed3d488c1e2cff9fc1fe9c98daed60 (diff) | |
zsh/pth/zsync: cross fixes (#65780)
zsh/pth/zsync: cross fixes
| -rw-r--r-- | pkgs/development/libraries/pth/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/compression/zsync/default.nix | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index c315cb8f72b4..b2173ec21ee1 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") + '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' + configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") ''; meta = with stdenv.lib; { @@ -17,6 +19,5 @@ stdenv.mkDerivation rec { homepage = https://www.gnu.org/software/pth; license = licenses.lgpl21Plus; platforms = platforms.all; - broken = stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index b74b2fc43f30..e9458520bb49 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre }: +{ stdenv, fetchurl, ncurses, pcre, buildPackages }: let version = "5.7.1"; @@ -7,7 +7,6 @@ let url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh"; }; - in stdenv.mkDerivation { @@ -61,7 +60,11 @@ else fi fi EOF - $out/bin/zsh -c "zcompile $out/etc/zprofile" + ${if stdenv.hostPlatform == stdenv.buildPlatform then '' + $out/bin/zsh -c "zcompile $out/etc/zprofile" + '' else '' + ${stdenv.lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" + ''} mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used ''; # XXX: patch zsh to take zwc if newer _or equal_ diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 89016b3ff40f..830e5f10ef6d 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; + makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + meta = { homepage = http://zsync.moria.org.uk/; description = "File distribution system using the rsync algorithm"; |