diff options
| author | Florian Klink <flokli@flokli.de> | 2020-06-20 10:16:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 10:16:23 +0200 |
| commit | 8276081651f335d1c8854bb53217dd6ac962a53f (patch) | |
| tree | aa9484c8254f2779868b628b3791e38ae00bb0ea /pkgs/development/libraries | |
| parent | 34f19a46862d19a5fca920e9e57fdecc8beabc6f (diff) | |
| parent | 7156cd1c3918f1533af6196bbeff615474d5aecc (diff) | |
| download | nixpkgs-8276081651f335d1c8854bb53217dd6ac962a53f.tar nixpkgs-8276081651f335d1c8854bb53217dd6ac962a53f.tar.gz nixpkgs-8276081651f335d1c8854bb53217dd6ac962a53f.tar.bz2 nixpkgs-8276081651f335d1c8854bb53217dd6ac962a53f.tar.lz nixpkgs-8276081651f335d1c8854bb53217dd6ac962a53f.tar.xz nixpkgs-8276081651f335d1c8854bb53217dd6ac962a53f.tar.zst nixpkgs-8276081651f335d1c8854bb53217dd6ac962a53f.zip | |
Merge pull request #91139 from Ericson2314/libgpg-error-cross
libgpg-error: Fix cross build
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libgpg-error/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 1e49a72096a..972ca4c04a5 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -34,6 +34,16 @@ in stdenv.mkDerivation (rec { '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h + '' + # This file was accidentally excluded from the sdist until + # 013720333c6ec1d38791689bc49ba039d98e16b3, post release. + # TODO make unconditional next mass rebuild + + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp ${fetchurl { + url = "https://raw.githubusercontent.com/gpg/libgpg-error/50e62b36ea01ed25d12c443088b85d4f41a2b3e1/src/gen-lock-obj.sh"; + sha256 = "10cslipa6npalj869asaamj0w941dhmx0yjafpyyh69ypsg2m2c3"; + }} ./src/gen-lock-obj.sh + chmod +x ./src/gen-lock-obj.sh ''; outputs = [ "out" "dev" "info" ]; |