mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge pull request #140197 from makefu/pkgs/proot/5.2.0
proot: 20190510 -> 5.2.0
This commit is contained in:
commit
729d1d6ba5
1 changed files with 23 additions and 8 deletions
|
@ -1,15 +1,20 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, talloc, docutils, swig, python, coreutils, enablePython ? true }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, talloc
|
||||
, pkg-config
|
||||
, libarchive
|
||||
, git
|
||||
, ncurses
|
||||
, docutils, swig, python3, coreutils, enablePython ? true }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proot";
|
||||
version = "20190510";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "proot";
|
||||
owner = "proot-me";
|
||||
rev = "803e54d8a1b3d513108d3fc413ba6f7c80220b74";
|
||||
sha256 = "0gwzqm5wpscj3fchlv3qggf3zzn0v00s4crb5ciwljan1zrqadhy";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ir3a7rp9rvpv9i8gjrkr383sqadgl7f9nflcrfg7q05bxapwiws";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -19,8 +24,15 @@ stdenv.mkDerivation {
|
|||
sed -i /CROSS_COMPILE/d src/GNUmakefile
|
||||
'';
|
||||
|
||||
buildInputs = [ talloc ] ++ lib.optional enablePython python;
|
||||
nativeBuildInputs = [ docutils ] ++ lib.optional enablePython swig;
|
||||
buildInputs = [ ncurses libarchive talloc ] ++ lib.optional enablePython python3;
|
||||
nativeBuildInputs = [ pkg-config docutils ] ++ lib.optional enablePython swig;
|
||||
patches = [
|
||||
# without this patch the package does not build with python>3.7
|
||||
(fetchpatch {
|
||||
url = "https://github.com/proot-me/proot/pull/285.patch";
|
||||
sha256= "1vncq36pr4v0h63fijga6zrwlsb0vb4pj25zxf1ni15ndxv63pxj";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -36,6 +48,9 @@ stdenv.mkDerivation {
|
|||
install -Dm644 doc/proot/man.1 $out/share/man/man1/proot.1
|
||||
'';
|
||||
|
||||
# proot provides tests with `make -C test` however they do not run in the sandbox
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://proot-me.github.io";
|
||||
description = "User-space implementation of chroot, mount --bind and binfmt_misc";
|
||||
|
|
Loading…
Reference in a new issue