diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-08-03 14:09:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 14:09:18 +0100 |
| commit | 30b3f277b6854b18f6dc06e39e66b638bf945efd (patch) | |
| tree | a413d82d5d74b55bcde65ad8934c332a4d639102 /pkgs | |
| parent | a6c7132abc972b91826db1cf6f820d6b1b454ba0 (diff) | |
| parent | 656a7abd351cb157f40e9dc765e5e8b7a1127c0b (diff) | |
| download | nixlib-30b3f277b6854b18f6dc06e39e66b638bf945efd.tar nixlib-30b3f277b6854b18f6dc06e39e66b638bf945efd.tar.gz nixlib-30b3f277b6854b18f6dc06e39e66b638bf945efd.tar.bz2 nixlib-30b3f277b6854b18f6dc06e39e66b638bf945efd.tar.lz nixlib-30b3f277b6854b18f6dc06e39e66b638bf945efd.tar.xz nixlib-30b3f277b6854b18f6dc06e39e66b638bf945efd.tar.zst nixlib-30b3f277b6854b18f6dc06e39e66b638bf945efd.zip | |
Merge pull request #44275 from georgewhewell/fix-libgpg-error-cross
fix libgpg-error cross build on armv7
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libgpg-error/default.nix | 2 |
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 ''; |