From 6fe2cdd03c98270b0ce0026acf8dab0a6c4d3d63 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Sat, 31 Aug 2019 01:37:38 +0200 Subject: [PATCH] libgpg-error: fix build with gawk 5 --- pkgs/development/libraries/libgpg-error/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index f3e1b8b0f997..03c29c8441f2 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, gettext +{ stdenv, lib, buildPackages, fetchurl, fetchpatch, gettext , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { @@ -24,7 +24,18 @@ in stdenv.mkDerivation (rec { sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds"; }; + # Remove gawk buildfix on > 1.36 + patches = [ + (fetchpatch { + url = "https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf?diff=1"; + sha256 = "0hs4rpwqq2afpsbqliq451jjaysq2iyzxvd9sx3992b4vnllgqqq"; + }) + ]; + postPatch = '' + # Remove on > 1.36 release: gawk upgrade fix didn't include Makefile regeneration + sed 's/-v namespace=errnos_/-v pkg_namespace=errnos_/' -i src/Makefile.in + sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h