From 6111416de7983c0918bb953778d226c71e4ae72c Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 1 Oct 2024 09:17:11 +0300 Subject: [PATCH] qt6.qtbase: propagate cups as host, not as build I am an idiot and a fool. strictDeps when. --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 417aeaf9bb31..f9c36c4311e9 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ vulkan-headers vulkan-loader - ]; + ] ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups; buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [ at-spi2-core @@ -192,8 +192,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; - propagatedNativeBuildInputs = [ lndir ] - ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups; + propagatedNativeBuildInputs = [ lndir ]; strictDeps = true;