From 6ddd6b4914fb392c7085eeae458d549e1852dccf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 3 Nov 2020 12:50:05 +0100 Subject: [PATCH] Revert "Merge pull request #93083 from risicle/ris-cpython-debug" This increase the closure size by 30 MB. https://github.com/NixOS/nixpkgs/pull/93083#issuecomment-718025366 This reverts commit 4b340cbbb4903173741ab9676a35cf26e15b0d3f, reversing changes made to 47e499f7a43bc5bc98d2b5f66204a5760642fb63. --- pkgs/development/interpreters/python/cpython/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index b25d613eb7f3..143662abcc93 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -291,13 +291,6 @@ in with passthru; stdenv.mkDerivation { find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - '' + optionalString stripBytecode '' find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}" - '' + '' - # *strip* shebang from libpython gdb script - it should be dual-syntax and - # interpretable by whatever python the gdb in question is using, which may - # not even match the major version of this python. doing this after the - # bytecode compilations for the same reason. - mkdir -p $out/share/gdb - sed '/^#!/d' Tools/gdb/libpython.py > $out/share/gdb/libpython.py ''; preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -315,8 +308,6 @@ in with passthru; stdenv.mkDerivation { pythonForBuild buildPackages.bash ]; - separateDebugInfo = true; - inherit passthru; enableParallelBuilding = true;