From e53785ad95b16310b1031897a674648464fe795b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 16 Oct 2017 23:00:35 -0400 Subject: [PATCH 1/2] proot: static by default --- 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 640750b4f2d..16ee4fccce8 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , talloc, docutils -, enableStatic ? false }: +, enableStatic ? true }: stdenv.mkDerivation rec { name = "proot-${version}"; From 10cc95e154d32c096155649d54f6774dee50889e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 17 Oct 2017 18:54:16 -0400 Subject: [PATCH 2/2] proot: 5.1.0 -> 5.1.0.20171015 --- pkgs/tools/system/proot/default.nix | 32 +++++++++++++++++++---------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 16ee4fccce8..8cf7f81381f 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -2,13 +2,12 @@ , talloc, docutils , enableStatic ? true }: -stdenv.mkDerivation rec { +({ version, rev, sha256, patches }: stdenv.mkDerivation { name = "proot-${version}"; - version = "5.1.0"; + inherit version; src = fetchFromGitHub { - sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz"; - rev = "v${version}"; + inherit rev sha256; repo = "proot"; owner = "cedric-vincent"; }; @@ -18,12 +17,7 @@ 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"; - }) - ]; + inherit patches; preBuild = stdenv.lib.optionalString enableStatic '' export LDFLAGS="-static" @@ -48,4 +42,20 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ ianwookim nckx makefu ]; }; -} +}) +(if stdenv.isAarch64 then rec { + version = "5.1.0"; + sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz"; + rev = "v${version}"; + 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"; + }) + ]; +} else { + version = "5.1.0.20171015"; + sha256 = "0jam87msh5jx8vpb19n6xwxw1xlig5amdcqif7gn2rc8nhswpxif"; + rev = "0bf2ee17daafeeadfed079cec97fe1ac781e696a"; + patches = []; +})