mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity

zsh/pth/zsync: cross fixes (#65780)

Browse source 
zsh/pth/zsync: cross fixes
This commit is contained in:
Jörg Thalheim 2019-08-14 07:15:01 +01:00 committed by GitHub
parent b5facab048 d0887921b3
commit cf5f02b4bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/pth/default.nix
View file

@ -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;
};
}

9
pkgs/shells/zsh/default.nix
View file

@ -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_

2
pkgs/tools/compression/zsync/default.nix
View file

@ -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";