phosh: re-enable the gnome qt5 styling, just without the qt6 piece
This commit is contained in:
parent
d34a03e060
commit
408cfc08a1
|
@ -247,7 +247,7 @@ in
|
||||||
in {
|
in {
|
||||||
# packages which don't cross compile
|
# packages which don't cross compile
|
||||||
inherit (emulated)
|
inherit (emulated)
|
||||||
# adwaita-qt # psqlodbc
|
# adwaita-qt6 # although qtbase cross-compiles with minor change, qtModule's qtbase can't
|
||||||
apacheHttpd_2_4 # `configure: error: Size of "void *" is less than size of "long"`
|
apacheHttpd_2_4 # `configure: error: Size of "void *" is less than size of "long"`
|
||||||
# duplicity # python3.10-s3transfer
|
# duplicity # python3.10-s3transfer
|
||||||
# gdk-pixbuf # cross-compiled version doesn't output bin/gdk-pixbuf-thumbnailer (used by webp-pixbuf-loader
|
# gdk-pixbuf # cross-compiled version doesn't output bin/gdk-pixbuf-thumbnailer (used by webp-pixbuf-loader
|
||||||
|
@ -273,6 +273,20 @@ in
|
||||||
# xdg-utils # perl5.36.0-File-BaseDir / perl5.36.0-Module-Build
|
# xdg-utils # perl5.36.0-File-BaseDir / perl5.36.0-Module-Build
|
||||||
;
|
;
|
||||||
|
|
||||||
|
# adwaita-qt6 = prev.adwaita-qt6.override {
|
||||||
|
# # adwaita-qt6 still uses the qt5 version of these libs by default?
|
||||||
|
# inherit (next.qt6) qtbase qtwayland;
|
||||||
|
# };
|
||||||
|
# qt6 doesn't cross compile. the only thing that wants it is phosh/gnome, in order to
|
||||||
|
# configure qt6 apps to look stylistically like gtk apps.
|
||||||
|
# adwaita-qt6 isn't an input into any other packages we build -- it's just placed on the systemPackages.
|
||||||
|
# so... just set it to null and that's Good Enough (TM).
|
||||||
|
# adwaita-qt6 = derivation { name = "null-derivation"; builder = "/dev/null"; }; # null;
|
||||||
|
# adwaita-qt6 = next.stdenv.mkDerivation { name = "null-derivation"; };
|
||||||
|
adwaita-qt6 = next.emptyDirectory;
|
||||||
|
# same story as qdwaita-qt6
|
||||||
|
qgnomeplatform-qt6 = next.emptyDirectory;
|
||||||
|
|
||||||
# apacheHttpd_2_4 = prev.apacheHttpd_2_4.override {
|
# apacheHttpd_2_4 = prev.apacheHttpd_2_4.override {
|
||||||
# # fixes original error
|
# # fixes original error
|
||||||
# # new failure mode: "/nix/store/czvaa9y9ch56z53c0b0f5bsjlgh14ra6-apr-aarch64-unknown-linux-gnu-1.7.0-dev/share/build/libtool: line 1890: aarch64-unknown-linux-gnu-ar: command not found"
|
# # new failure mode: "/nix/store/czvaa9y9ch56z53c0b0f5bsjlgh14ra6-apr-aarch64-unknown-linux-gnu-1.7.0-dev/share/build/libtool: line 1890: aarch64-unknown-linux-gnu-ar: command not found"
|
||||||
|
|
|
@ -52,8 +52,8 @@ in
|
||||||
# TODO(2023/02/28): remove this qt.style = "gtk2" override.
|
# TODO(2023/02/28): remove this qt.style = "gtk2" override.
|
||||||
# gnome by default tells qt to stylize its apps similar to gnome.
|
# gnome by default tells qt to stylize its apps similar to gnome.
|
||||||
# but the package needed for that doesn't cross-compile, hence i disable that here.
|
# but the package needed for that doesn't cross-compile, hence i disable that here.
|
||||||
qt.platformTheme = "gtk2";
|
# qt.platformTheme = "gtk2";
|
||||||
qt.style = "gtk2";
|
# qt.style = "gtk2";
|
||||||
|
|
||||||
# docs: https://github.com/NixOS/nixpkgs/blob/nixos-22.05/nixos/modules/services/x11/desktop-managers/phosh.nix
|
# docs: https://github.com/NixOS/nixpkgs/blob/nixos-22.05/nixos/modules/services/x11/desktop-managers/phosh.nix
|
||||||
services.xserver.desktopManager.phosh = {
|
services.xserver.desktopManager.phosh = {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user