JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #91139 from Ericson2314/libgpg-error-cross

Browse Source 
libgpg-error: Fix cross build
This commit is contained in:
Florian Klink 2020-06-20 10:16:23 +02:00 committed by GitHub
commit 8276081651
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libgpg-error/default.nix
View File

@ -34,6 +34,16 @@ in stdenv.mkDerivation (rec {
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' '' + 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.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 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" ]; outputs = [ "out" "dev" "info" ];