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

libgpg-error: fix on ARM

Browse Source
This commit is contained in:
Nikolay Amiantov 2018-03-23 01:18:07 +03:00
parent 077dedbf24
commit 7a77439b03
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/libgpg-error/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, buildPackages, fetchurl, gettext
, hostPlatform, genPosixLockObjOnly ? false
{ stdenv, lib, fetchpatch, buildPackages, fetchurl, gettext
, genPosixLockObjOnly ? false
}: let
genPosixLockObjOnlyAttrs = stdenv.lib.optionalAttrs genPosixLockObjOnly {
genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly {
buildPhase = ''
cd src
make gen-posix-lock-obj
@ -24,9 +24,17 @@ in stdenv.mkDerivation (rec {
sha256 = "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry";
};
patches = [
# Fix builds on ARM, AArch64
(fetchpatch {
url = "https://github.com/gpg/libgpg-error/commit/791177de023574223eddf7288eb7c5a0721ac623.patch";
sha256 = "0vqfw0ak1j37wf6sk9y9vmdyk3kxdxkldhs0bv2waa76s11cmdx0";
})
];
postPatch = ''
sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h
'';
@ -39,7 +47,7 @@ in stdenv.mkDerivation (rec {
nativeBuildInputs = [ gettext ];
postConfigure =
stdenv.lib.optionalString stdenv.isSunOS
lib.optionalString stdenv.isSunOS
# For some reason, /bin/sh on OpenIndiana leads to this at the end of the
# `config.status' run:
# ./config.status[1401]: shift: (null): bad number