diff options
author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-01-10 18:32:47 +0000 |
---|---|---|
committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-01-15 12:29:42 +0000 |
commit | 66093a4120eb63e0ec2a7b5c14031920b7a3078d (patch) | |
tree | c010d38b4564d04b7413a9a02741cb95a97f2252 | |
parent | c44e0571fccee3d2da453e106bf947f8db575273 (diff) | |
download | nixpkgs-66093a4120eb63e0ec2a7b5c14031920b7a3078d.tar nixpkgs-66093a4120eb63e0ec2a7b5c14031920b7a3078d.tar.gz nixpkgs-66093a4120eb63e0ec2a7b5c14031920b7a3078d.tar.bz2 nixpkgs-66093a4120eb63e0ec2a7b5c14031920b7a3078d.tar.lz nixpkgs-66093a4120eb63e0ec2a7b5c14031920b7a3078d.tar.xz nixpkgs-66093a4120eb63e0ec2a7b5c14031920b7a3078d.tar.zst nixpkgs-66093a4120eb63e0ec2a7b5c14031920b7a3078d.zip |
python27: remove stripLibs argument
Since we are now guarantee that the `resholve` is not exposing `python27`, let's remove the `stripLibs` hack that tried to reduce its size.
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/misc/resholve/default.nix | 54 |
2 files changed, 1 insertions, 64 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index c3c0687d2cf..cfcf487b435 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -35,7 +35,6 @@ , stripConfig ? false , stripIdlelib ? false , stripTests ? false -, stripLibs ? [ ] , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -322,15 +321,7 @@ in with passthru; stdenv.mkDerivation ({ '' + optionalString stripTests '' # Strip tests rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} - '' + (concatStringsSep "\n" - (map - (lib: - '' - rm -vR $out/lib/python*/${lib} - # libraries in dynload (C libraries) may not exist, - # but when they exist they may be prefixed with _ - rm -vfR $out/lib/python*/lib-dynload/{,_}${lib} - '') stripLibs)); + ''; enableParallelBuilding = true; diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index fa1de609d6a..4247d1ab21d 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -26,60 +26,6 @@ let stripConfig = true; stripIdlelib = true; stripTests = true; - stripLibs = [ - # directories - "bsddb*" - "curses" - "compiler" - "ensurepip" - "hotshot" - "lib-tk" - "sqlite3" - # files - "aifc*" - "antigravity*" - "async*" - "*audio*" - "BaseHTTPServer*" - "Bastion*" - "binhex*" - "bdb*" - "CGIHTTPServer*" - "cgitb*" - "chunk*" - "colorsys*" - "dbhash*" - "dircache*" - "*dbm*" - "ftplib*" - "*hdr*" - "imaplib*" - "imputil*" - "MimeWriter*" - "mailbox*" - "mhlib*" - "mimify*" - "multifile*" - "netrc*" - "nntplib*" - "os2emxpath*" - "pyclbr*" - "pydoc*" - "SimpleHTTPServer*" - "sgmllib*" - "smtp*" - "ssl*" - "sun*" - "tabnanny*" - "telnetlib*" - "this*" - "wave*" - "webbrowser*" - "whichdb*" - "wsgiref*" - "xdrlib*" - "*XMLRPC*" - ]; enableOptimizations = false; }; callPackage = lib.callPackageWith (pkgs // { python27 = python27'; }); |