git.iko.soy/typeable/nixpkgs
on master help sign in
zsh/pth/zsync: cross fixes (#65780)

zsh/pth/zsync: cross fixes

commitcf5f02b4bb52d3df1d1d8a4875155d4f077e8f56 authorJörg Thalheim <Mic92@users.noreply.github.com> dateWed 14 Aug 2019, 07:15 (7 years ago) parentb5facabd088792
3 files changed+10−4
pkgs/development/libraries/pth/default.nix+2−1 pkgs/shells/zsh/default.nix+6−3 pkgs/tools/compression/zsync/default.nix+2
pkgs/development/libraries/pth/default.nix+2−1
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
1010
1111 preConfigure = stdenv.lib.optionalString stdenv.isAarch32 ''
1212 configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9")
13+ '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
14+ configureFlagsArray+=("ac_cv_check_sjlj=ssjlj")
1315 '';
1416
1517 meta = with stdenv.lib; {
@@ -17,6 +19,5 @@ stdenv.mkDerivation rec {
1719 homepage = https://www.gnu.org/software/pth;
1820 license = licenses.lgpl21Plus;
1921 platforms = platforms.all;
20− broken = stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isAarch64;
2122 };
2223}
pkgs/shells/zsh/default.nix+6−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ncurses, pcre }:
1+{ stdenv, fetchurl, ncurses, pcre, buildPackages }:
22
33let
44 version = "5.7.1";
@@ -7,7 +7,6 @@ let
77 url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
88 sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh";
99 };
10−
1110in
1211
1312stdenv.mkDerivation {
@@ -61,7 +60,11 @@ else
6160 fi
6261fi
6362EOF
64− $out/bin/zsh -c "zcompile $out/etc/zprofile"
63+ ${if stdenv.hostPlatform == stdenv.buildPlatform then ''
64+ $out/bin/zsh -c "zcompile $out/etc/zprofile"
65+ '' else ''
66+ ${stdenv.lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile"
67+ ''}
6568 mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used
6669 '';
6770 # XXX: patch zsh to take zwc if newer _or equal_
pkgs/tools/compression/zsync/default.nix+2
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
88 sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b";
99 };
1010
11+ makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
12+
1113 meta = {
1214 homepage = http://zsync.moria.org.uk/;
1315 description = "File distribution system using the rsync algorithm";