Skip to content

Commit

Permalink
nixos/no-x-libs: build qtbase without qt translation
Browse files Browse the repository at this point in the history
  • Loading branch information
Izorkin committed Dec 25, 2023
1 parent b59ddb3 commit 2e14d8b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion nixos/modules/config/no-x-libs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ with lib;
qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });
qt5 = super.qt5.overrideScope (const (super': {
qtbase = super'.qtbase.override { withGtk3 = false; };
qtbase = super'.qtbase.override { withGtk3 = false; withQttranslation = false; };
}));
stoken = super.stoken.override { withGTK3 = false; };
# translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/libraries/qt-5/modules/qtbase.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# optional dependencies
, cups ? null, postgresql ? null
, withGtk3 ? false, dconf, gtk3
, qttranslations ? null
, withQttranslation ? true, qttranslations ? null

# options
, libGLSupported ? !stdenv.isDarwin
Expand Down Expand Up @@ -351,7 +351,8 @@ stdenv.mkDerivation (finalAttrs: ({
] ++ lib.optionals (mysqlSupport) [
"-L" "${libmysqlclient}/lib"
"-I" "${libmysqlclient}/include"
] ++ lib.optional (qttranslations != null) [
] ++ lib.optional (withQttranslation && (qttranslations != null)) [
# depends on x11
"-translationdir" "${qttranslations}/translations"
]
);
Expand Down

0 comments on commit 2e14d8b

Please sign in to comment.