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

Merge pull request #57195 from dtzWill/update/proot-5.1.0.20190305

Browse Source 
proot: update, consolidate, python extension support
This commit is contained in:
Dmitry Kalinkin 2019-03-10 23:21:04 -04:00 committed by GitHub
commit 2274611acb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,30 +1,34 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub
, talloc, docutils }: , talloc, docutils, swig, python, coreutils, enablePython ? true }:
({ version, rev, sha256, patches }: stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "proot-${version}"; pname = "proot";
inherit version; version = "5.1.0.20190305";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev sha256;
repo = "proot"; repo = "proot";
owner = "proot-me"; owner = "proot-me";
rev = "ff61c86cb26f71c06af22574d9d4cc3a77292781";
sha256 = "0qink34bjv0lshf3c8997w39r8yxgbhxpjbxw47l5xkvimlpc0dl";
}; };
buildInputs = [ talloc ]; postPatch = ''
nativeBuildInputs = [ docutils ]; substituteInPlace src/GNUmakefile \
--replace /bin/echo ${coreutils}/bin/echo
'';
buildInputs = [ talloc ] ++ stdenv.lib.optional enablePython python;
nativeBuildInputs = [ docutils ] ++ stdenv.lib.optional enablePython swig;
enableParallelBuilding = true; enableParallelBuilding = true;
inherit patches;
makeFlags = [ "-C src" ]; makeFlags = [ "-C src" ];
postBuild = '' postBuild = ''
make -C doc proot/man.1 make -C doc proot/man.1
''; '';
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = '' postInstall = ''
install -Dm644 doc/proot/man.1 $out/share/man/man1/proot.1 install -Dm644 doc/proot/man.1 $out/share/man/man1/proot.1
@ -35,22 +39,6 @@
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 makefu veprbl ]; maintainers = with maintainers; [ ianwookim makefu veprbl dtzWill ];
}; };
}) }
(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.20181214";
sha256 = "07g1gfyjq7rypjdwxw495sk8k1y2i3y3nsm1rh9kgx3z47z28aah";
rev = "11972c0dab34e088c55c16a94d26c399ca7a26d8";
patches = [];
})