diff options
author | R. RyanTM <ryantm-bot@ryantm.com> | 2019-08-31 04:13:30 -0700 |
---|---|---|
committer | Samuel Leathers <disasm@gmail.com> | 2019-08-31 07:13:30 -0400 |
commit | 50d8295cc6aea7ace262b754b36979e210de6967 (patch) | |
tree | 63ae3f84481b68217deffc050cdffb31f2234b39 /pkgs/development/libraries/libgpg-error | |
parent | 5017f4c608ec8c242fd6f7effc2bde22203b1a19 (diff) | |
download | nixlib-50d8295cc6aea7ace262b754b36979e210de6967.tar nixlib-50d8295cc6aea7ace262b754b36979e210de6967.tar.gz nixlib-50d8295cc6aea7ace262b754b36979e210de6967.tar.bz2 nixlib-50d8295cc6aea7ace262b754b36979e210de6967.tar.lz nixlib-50d8295cc6aea7ace262b754b36979e210de6967.tar.xz nixlib-50d8295cc6aea7ace262b754b36979e210de6967.tar.zst nixlib-50d8295cc6aea7ace262b754b36979e210de6967.zip |
gawk: 4.2.1 -> 5.0.1 (#59503)
* gawk: 4.2.1 -> 5.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gawk/versions * libgpg-error: fix build with gawk 5 Cherry picked commit 6fe2cdd03c98270b0ce0026acf8dab0a6c4d3d63 from https://github.com/NixOS/nixpkgs/pull/67801.
Diffstat (limited to 'pkgs/development/libraries/libgpg-error')
-rw-r--r-- | pkgs/development/libraries/libgpg-error/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index f3e1b8b0f997..d7fb35897dc4 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, gettext, fetchpatch , 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 |