alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

python3Minimal: enable strictDeps

Browse source 
remove unused let binding from the main expr

verified that cross-compiling still works
This commit is contained in:
Artturin 2022-05-22 04:17:00 +03:00
parent f002ffed9a
commit 6b46fa896e
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/interpreters/python/cpython/default.nix
View file

@ -104,8 +104,6 @@ let
version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
strictDeps = true;
nativeBuildInputs = optionals (!stdenv.isDarwin) [ nativeBuildInputs = optionals (!stdenv.isDarwin) [
autoreconfHook autoreconfHook
pkg-config pkg-config
@ -186,7 +184,8 @@ in with passthru; stdenv.mkDerivation {
pname = "python3"; pname = "python3";
inherit version; inherit version;
inherit buildInputs nativeBuildInputs; inherit nativeBuildInputs;
buildInputs = [ bash ] ++ buildInputs; # bash is only for patchShebangs
src = fetchurl { src = fetchurl {
url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz"; url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz";
@ -465,7 +464,7 @@ in with passthru; stdenv.mkDerivation {
preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
# Ensure patch-shebangs uses shebangs of host interpreter. # Ensure patch-shebangs uses shebangs of host interpreter.
export PATH=${lib.makeBinPath [ "$out" bash ]}:$PATH export PATH=${lib.makeBinPath [ "$out" ]}:$PATH
''; '';
# Add CPython specific setup-hook that configures distutils.sysconfig to # Add CPython specific setup-hook that configures distutils.sysconfig to

2
pkgs/development/interpreters/python/default.nix
View file

@ -231,6 +231,8 @@ in {
enableLTO = false; enableLTO = false;
mimetypesSupport = false; mimetypesSupport = false;
} // sources.python39)).overrideAttrs(old: { } // sources.python39)).overrideAttrs(old: {
# TODO(@Artturin): Add this to the main cpython expr
strictDeps = true;
pname = "python3-minimal"; pname = "python3-minimal";
meta = old.meta // { meta = old.meta // {
maintainers = []; maintainers = [];