diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-31 21:32:15 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-31 21:32:15 +0200 |
| commit | 3e0f4e202f4221d5a05a9664fd46e492de711fa2 (patch) | |
| tree | 5f62c67bff9ccc643621e80b04cf43e3959d723d /pkgs/development/interpreters | |
| parent | a803f716bdf756edaedbdd99d66cf04f27496682 (diff) | |
| parent | a8811cb82bab25aa835a09dc48a2d9450448d6d5 (diff) | |
| download | nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar.gz nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar.bz2 nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar.lz nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar.xz nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar.zst nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/erlang/R22.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 88fe21453a82..7596ad9e2f10 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "22.1.7"; - sha256 = "18aqy2s8nqd82v4lzzxknrwjva8mv1y2hvai9cakz5nkyd3vwq62"; + version = "22.3"; + sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27"; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d9d004090953..abf2e223a4d1 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -29,6 +29,7 @@ , rebuildBytecode ? true , stripBytecode ? false , includeSiteCustomize ? true +, static ? false }: assert x11Support -> tcl != null @@ -131,7 +132,7 @@ in with passthru; stdenv.mkDerivation { CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; - NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "-lgcc_s" + optionalString stdenv.hostPlatform.isMusl "-lgcc_eh"; # Determinism: We fix the hashes of str, bytes and datetime objects. PYTHONHASHSEED=0; @@ -170,7 +171,7 @@ in with passthru; stdenv.mkDerivation { # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. "ac_cv_func_lchmod=no" - ]; + ] ++ optional static "LDFLAGS=-static"; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity @@ -263,7 +264,7 @@ in with passthru; stdenv.mkDerivation { # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = - stdenv.lib.optionals (openssl != null) [ openssl.dev ] + stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. |