Merge pull request #241565 from SuperSandro2000/nox-python

nixos/no-x-libs: use pythonPackagesExtensions to construct python ove…
This commit is contained in:
Lily Foster 2023-08-07 10:56:27 -04:00 committed by GitHub
commit b367b9cf87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -26,12 +26,7 @@ with lib;
fonts.fontconfig.enable = false; fonts.fontconfig.enable = false;
nixpkgs.overlays = singleton (self: super: let nixpkgs.overlays = singleton (const (super: {
packageOverrides = const (python-prev: {
# tk feature requires wayland which fails to compile
matplotlib = python-prev.matplotlib.override { enableGtk3 = false; enableTk = false; enableQt = false; };
});
in {
beam = super.beam_nox; beam = super.beam_nox;
cairo = super.cairo.override { x11Support = false; }; cairo = super.cairo.override { x11Support = false; };
dbus = super.dbus.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; };
@ -67,8 +62,12 @@ with lib;
pango = super.pango.override { x11Support = false; }; pango = super.pango.override { x11Support = false; };
pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };
pipewire = super.pipewire.override { x11Support = false; }; pipewire = super.pipewire.override { x11Support = false; };
python3 = super.python3.override { inherit packageOverrides; }; pythonPackagesExtensions = super.pythonPackagesExtensions ++ [
python3Packages = self.python3.pkgs; # required otherwise overlays from above are not forwarded (python-final: python-prev: {
# tk feature requires wayland which fails to compile
matplotlib = python-prev.matplotlib.override { enableTk = false; };
})
];
qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });
qt5 = super.qt5.overrideScope (const (super': { qt5 = super.qt5.overrideScope (const (super': {
@ -79,6 +78,6 @@ with lib;
util-linux = super.util-linux.override { translateManpages = false; }; util-linux = super.util-linux.override { translateManpages = false; };
vim-full = super.vim-full.override { guiSupport = false; }; vim-full = super.vim-full.override { guiSupport = false; };
zbar = super.zbar.override { enableVideo = false; withXorg = false; }; zbar = super.zbar.override { enableVideo = false; withXorg = false; };
}); }));
}; };
} }