diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-05 12:34:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-05 12:34:05 +0200 |
| commit | 0be2928ac9f8fa7ad2245785e586381ba8002585 (patch) | |
| tree | c1d9a25219eb2e614c945aeac3e9ea33f74a135b /pkgs/tools/system | |
| parent | 81025f9ef717895b4170bf93b234311d0f8f2386 (diff) | |
| parent | 623df97af5a1bf1f5dcbf9075b0ac8cbba036e25 (diff) | |
Merge branch 'master' into staging
Evaluation was blocked on Hydra; this should fix it.
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/proot/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 5d65267311f4e..640750b4f2d3d 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, talloc, docutils +{ stdenv, fetchFromGitHub, fetchpatch +, talloc, docutils , enableStatic ? false }: stdenv.mkDerivation rec { @@ -17,6 +18,13 @@ stdenv.mkDerivation rec { 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 '' export LDFLAGS="-static" ''; @@ -38,6 +46,6 @@ stdenv.mkDerivation rec { description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ ianwookim nckx ]; + maintainers = with maintainers; [ ianwookim nckx makefu ]; }; } |