diff options
| author | Luca Bruno <luca.bruno@immobiliare.it> | 2014-10-07 14:05:31 +0200 |
|---|---|---|
| committer | Luca Bruno <luca.bruno@immobiliare.it> | 2014-10-07 14:05:31 +0200 |
| commit | e229cfb57c2653e3a50edea9ed894ff48bf86276 (patch) | |
| tree | 3a6f757bc350e38d8bbb464465deabb535c755f9 /pkgs | |
| parent | 1992bd1331b5ce203ef21c01d9a0056fc5b32a25 (diff) | |
| download | nixlib-e229cfb57c2653e3a50edea9ed894ff48bf86276.tar nixlib-e229cfb57c2653e3a50edea9ed894ff48bf86276.tar.gz nixlib-e229cfb57c2653e3a50edea9ed894ff48bf86276.tar.bz2 nixlib-e229cfb57c2653e3a50edea9ed894ff48bf86276.tar.lz nixlib-e229cfb57c2653e3a50edea9ed894ff48bf86276.tar.xz nixlib-e229cfb57c2653e3a50edea9ed894ff48bf86276.tar.zst nixlib-e229cfb57c2653e3a50edea9ed894ff48bf86276.zip | |
Revert "Merge pull request #4406 from wavewave/proot"
This reverts commit 552d1ec8b36515c3de5d660815a521353419bae6, reversing changes made to 3432414808afa5bdb2019f165365f5b6ff46cf2f.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/system/proot/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 0 insertions, 31 deletions
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix deleted file mode 100644 index f338521b87cd..000000000000 --- a/pkgs/tools/system/proot/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchgit, talloc }: - -stdenv.mkDerivation rec { - name = "proot-${version}"; - version = "4.0.3"; - - src = fetchgit { - url = "git://github.com/cedric-vincent/proot.git"; - rev = "refs/tags/v${version}"; - sha256 = "95a52b2fa47b2891eb2c6b6b0e14d42f6d48f6fd5181e359b007831f1a046e84"; - }; - - buildInputs = [ talloc ]; - - preBuild = '' - substituteInPlace GNUmakefile --replace "/usr/local" "$out" - ''; - - sourceRoot = "git-export/src"; - - meta = with stdenv.lib; { - homepage = http://proot.me; - description = "User-space implementation of chroot, mount --bind and binfmt_misc"; - platforms = platforms.linux; - license = licenses.gpl2; - maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a690eacf258..0676a62fe9d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2027,8 +2027,6 @@ let projectm = callPackage ../applications/audio/projectm { }; - proot = callPackage ../tools/system/proot { }; - proxychains = callPackage ../tools/networking/proxychains { }; proxytunnel = callPackage ../tools/misc/proxytunnel { }; |