diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2017-10-17 18:54:16 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2017-10-17 22:54:01 -0400 |
| commit | 10cc95e154d32c096155649d54f6774dee50889e (patch) | |
| tree | 75b34d6098dc71bf7cbcb2a34345b2845b677d22 /pkgs/tools | |
| parent | e53785ad95b16310b1031897a674648464fe795b (diff) | |
| download | nixpkgs-10cc95e154d32c096155649d54f6774dee50889e.tar nixpkgs-10cc95e154d32c096155649d54f6774dee50889e.tar.gz nixpkgs-10cc95e154d32c096155649d54f6774dee50889e.tar.bz2 nixpkgs-10cc95e154d32c096155649d54f6774dee50889e.tar.lz nixpkgs-10cc95e154d32c096155649d54f6774dee50889e.tar.xz nixpkgs-10cc95e154d32c096155649d54f6774dee50889e.tar.zst nixpkgs-10cc95e154d32c096155649d54f6774dee50889e.zip | |
proot: 5.1.0 -> 5.1.0.20171015
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/system/proot/default.nix | 32 |
1 files 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 = []; +}) |