From 2de4b6139e7fa5fd70e3e6d33766f20a2cb66e99 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 10 Jan 2023 14:59:34 +0100 Subject: [PATCH] qt6.qtbase: enable framework builds --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index d3aafe84ef7d..d539abff5130 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -127,11 +127,10 @@ stdenv.mkDerivation rec { unixODBCDrivers.psql unixODBCDrivers.sqlite unixODBCDrivers.mariadb - ] ++ lib.optionals stdenv.isLinux [ - util-linux ] ++ lib.optionals systemdSupport [ systemd - ] ++ [ + ] ++ lib.optionals stdenv.isLinux [ + util-linux mtdev lksctp-tools libselinux @@ -223,8 +222,6 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.isDarwin [ - # build as a set of dynamic libraries - "-DFEATURE_framework=OFF" # error: 'path' is unavailable: introduced in macOS 10.15 "-DQT_FEATURE_cxx17_filesystem=OFF" ]; @@ -272,8 +269,10 @@ stdenv.mkDerivation rec { moveToOutput libexec "$dev" # fixup .pc file (where to find 'moc' etc.) - sed -i "$dev/lib/pkgconfig/Qt6Core.pc" \ - -e "/^bindir=/ c bindir=$dev/bin" + if [ -d "$dev/lib/pkgconfig" ]; then + sed -i "$dev/lib/pkgconfig/Qt6Core.pc" \ + -e "/^bindir=/ c bindir=$dev/bin" + fi patchShebangs $out $dev