From b59ddb30f46babd5214fef8dcaef79e07e643a5b Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 25 Dec 2023 23:30:24 +0300 Subject: [PATCH 1/2] pipewire: fix build without x11 support --- pkgs/development/libraries/pipewire/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 5d0ffee503b8..fa5cb97b214f 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -68,7 +68,7 @@ , mysofaSupport ? true , libmysofa , tinycompress -, ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, ffadoSupport ? x11Support && stdenv.buildPlatform.canExecute stdenv.hostPlatform , ffado , libselinux }: From 2e14d8ba72b07047d1dda0ed8161956fba34ee0a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 25 Dec 2023 23:31:25 +0300 Subject: [PATCH 2/2] nixos/no-x-libs: build qtbase without qt translation --- nixos/modules/config/no-x-libs.nix | 2 +- pkgs/development/libraries/qt-5/modules/qtbase.nix | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index ec26d4b12eff..0a51ce77f3fc 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -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 diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 67e9bd5440d1..594489a0d750 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -15,7 +15,7 @@ # optional dependencies , cups ? null, postgresql ? null , withGtk3 ? false, dconf, gtk3 -, qttranslations ? null +, withQttranslation ? true, qttranslations ? null # options , libGLSupported ? !stdenv.isDarwin @@ -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" ] );