diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-03 13:56:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 13:56:55 -0400 |
| commit | 64f837491c2221aa56bed28586d7ec1f570246d9 (patch) | |
| tree | 20f46418f3621ac61433bbf8738c3410ef38f126 /pkgs | |
| parent | c3f6b46db6b6438a698ea3c8bf1e17a660780e63 (diff) | |
| parent | cc582920f27383bb45f5f381b528d31400cc7db4 (diff) | |
Merge pull request #62618 from matthewbauer/talloc-fix
proot/talloc fixes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/proot/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/static.nix | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 894a9b084c68b..bc90d93a7e3dd 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -22,6 +22,7 @@ , sourceVersion , sha256 , passthruFun +, static ? false }: assert x11Support -> tcl != null @@ -164,7 +165,8 @@ let ] # Never even try to use lchmod on linux, # 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 = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index c8028ed74a7c0..79b86f1383c07 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "proot"; - version = "5.1.0.20190305"; + version = "20190510"; src = fetchFromGitHub { repo = "proot"; owner = "proot-me"; - rev = "ff61c86cb26f71c06af22574d9d4cc3a77292781"; - sha256 = "0qink34bjv0lshf3c8997w39r8yxgbhxpjbxw47l5xkvimlpc0dl"; + rev = "803e54d8a1b3d513108d3fc413ba6f7c80220b74"; + sha256 = "0gwzqm5wpscj3fchlv3qggf3zzn0v00s4crb5ciwljan1zrqadhy"; }; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0915e80e9c275..de598c1cb14c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6714,7 +6714,7 @@ in deps = [ python ]; substitutions = { 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}"''; }; } ../development/tools/build-managers/waf/setup-hook.sh; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 3b8e40ea041b0..bee6761c285b3 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -158,4 +158,6 @@ in { }; }; + python27 = super.python27.override { static = true; }; + } |