From 05d2603173d428196b0f75703f5f1ee61e31c0ad Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 1 Oct 2017 15:24:18 +0200 Subject: [PATCH 1/2] proot: fix aarch64 build --- pkgs/tools/system/proot/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 5d65267311f4..08d5f7665aab 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" ''; From ab8e5f66aada83d02723e71c2b98ac0264d7fd09 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 1 Oct 2017 15:24:30 +0200 Subject: [PATCH 2/2] proot: add makefu as maintainer --- pkgs/tools/system/proot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 08d5f7665aab..640750b4f2d3 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -46,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 ]; }; }