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

Merge pull request #62618 from matthewbauer/talloc-fix

Browse Source 
proot/talloc fixes
This commit is contained in:
Matthew Bauer 2019-06-03 13:56:55 -04:00 committed by GitHub
commit 64f837491c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/python/cpython/2.7/default.nix
View File

@ -22,6 +22,7 @@
, sourceVersion , sourceVersion
, sha256 , sha256
, passthruFun , passthruFun
, static ? false
}: }:
assert x11Support -> tcl != null assert x11Support -> tcl != null
@ -164,7 +165,8 @@ let
] ]
# Never even try to use lchmod on linux, # Never even try to use lchmod on linux,
# don't rely on detecting glibc-isms. # don't rely on detecting glibc-isms.
++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"
++ optional static "LDFLAGS=-static";
buildInputs = buildInputs =
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "proot"; pname = "proot";
version = "5.1.0.20190305"; version = "20190510";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "proot"; repo = "proot";
owner = "proot-me"; owner = "proot-me";
rev = "ff61c86cb26f71c06af22574d9d4cc3a77292781"; rev = "803e54d8a1b3d513108d3fc413ba6f7c80220b74";
sha256 = "0qink34bjv0lshf3c8997w39r8yxgbhxpjbxw47l5xkvimlpc0dl"; sha256 = "0gwzqm5wpscj3fchlv3qggf3zzn0v00s4crb5ciwljan1zrqadhy";
}; };
postPatch = '' postPatch = ''

2
pkgs/top-level/all-packages.nix
View File

@ -6714,7 +6714,7 @@ in
deps = [ python ]; deps = [ python ];
substitutions = { substitutions = {
inherit waf; inherit waf;
crossFlags = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system)
''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"'';
}; };
} ../development/tools/build-managers/waf/setup-hook.sh; } ../development/tools/build-managers/waf/setup-hook.sh;

2
pkgs/top-level/static.nix
View File

@ -158,4 +158,6 @@ in {
}; };
}; };
python27 = super.python27.override { static = true; };
} }