about summary refs log tree commit diff
path: root/pkgs/development/libraries/libgpg-error/default.nix
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-08-04 15:17:42 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-08-04 15:17:42 +0300
commit008fd5fcf5f45c6478ccd3d52ec923052eccb932 (patch)
tree14d454f88bd0f02fe550ba5b68d987573e8820fc /pkgs/development/libraries/libgpg-error/default.nix
parent7a337cde318020a0f91702bfefee85a7b31be06f (diff)
parent20f1388c3fb7c1c56367fd96fd21cfd316f465b7 (diff)
downloadnixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar
nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.gz
nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.bz2
nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.lz
nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.xz
nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.zst
nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.zip
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/libraries/libgpg-error/default.nix')
-rw-r--r--pkgs/development/libraries/libgpg-error/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 2fcf6701ab8f..ccac20c90774 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -34,6 +34,8 @@ in stdenv.mkDerivation (rec {
 
   postPatch = ''
     sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
+  '' + lib.optionalString (stdenv.hostPlatform.isArm && stdenv.buildPlatform != stdenv.hostPlatform ) ''
+    ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h
   '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h
   '';