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

Merge pull request #29985 from makefu/pkgs/proot/aarch64-fix

Browse Source 
fix build for proot on aarch64
This commit is contained in:
Orivej Desh 2017-10-05 08:24:13 +00:00 committed by GitHub
commit 7c3f185a7f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/system/proot/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, talloc, docutils { stdenv, fetchFromGitHub, fetchpatch
, talloc, docutils
, enableStatic ? false }: , enableStatic ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,6 +18,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [
(fetchpatch { # debian patch for aarch64 build
sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv";
url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch";
})
];
preBuild = stdenv.lib.optionalString enableStatic '' preBuild = stdenv.lib.optionalString enableStatic ''
export LDFLAGS="-static" export LDFLAGS="-static"
''; '';
@ -38,6 +46,6 @@ stdenv.mkDerivation rec {
description = "User-space implementation of chroot, mount --bind and binfmt_misc"; description = "User-space implementation of chroot, mount --bind and binfmt_misc";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ ianwookim nckx ]; maintainers = with maintainers; [ ianwookim nckx makefu ];
}; };
} }