lol

Fix manylinux packages

Make sure lib outputs are used where applicable.

authored by

Tobias Pflug and committed by
Frederik Rietdijk
418ad571 8d2139d0

+7 -4
+7 -4
pkgs/development/interpreters/python/manylinux/default.nix
··· 33 33 fi 34 34 ''; 35 35 36 + getLibOutputs = lib.mapAttrs (k: v: lib.getLib v); 37 + 36 38 # https://www.python.org/dev/peps/pep-0599/ 37 - manylinux2014Libs = with pkgs; { 39 + manylinux2014Libs = getLibOutputs(with pkgs; { 38 40 "libgcc_s.so.1" = glibc; 39 41 "libstdc++.so.6" = stdenv.cc.cc; 40 42 "libm.so.6" = glibc; ··· 54 56 "libgobject-2.0.so.0" = glib; 55 57 "libgthread-2.0.so.0" = glib; 56 58 "libglib-2.0.so.0" = glib; 57 - }; 59 + }); 58 60 59 61 # https://www.python.org/dev/peps/pep-0571/ 60 62 manylinux2010Libs = manylinux2014Libs; 61 63 62 64 # https://www.python.org/dev/peps/pep-0513/ 63 - manylinux1Libs = manylinux2010Libs // (with pkgs; { 65 + manylinux1Libs = getLibOutputs(manylinux2010Libs // (with pkgs; { 64 66 "libpanelw.so.5" = ncurses5; 65 67 "libncursesw.so.5" = ncurses5; 66 68 "libcrypt.so.1" = glibc; 67 - }); 69 + })); 70 + 68 71 in { 69 72 # List of libraries that are needed for manylinux compatibility. 70 73 # When using a wheel that is manylinux1 compatible, just extend