diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-05-18 21:23:43 +0200 |
---|---|---|
committer | Sefa Eyeoglu <contact@scrumplex.net> | 2023-05-18 21:23:44 +0200 |
commit | 2294cfeaf8a87d8b1b51ea571d9c4e72d8d49ac1 (patch) | |
tree | 47cb1969b481a430e86a2c8cbf0f2c47a8df2912 /pkgs/development/libraries/libportal | |
parent | 7721e0d2c1845c24eafd5a016b9d349187c48097 (diff) |
libportal: fix build for qt5 variant
libportal-qt5 fails to build currently. This change disables the Qt wrapper, adds qtx11extras and disables docs, as all of these are required for the build to succeed. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'pkgs/development/libraries/libportal')
-rw-r--r-- | pkgs/development/libraries/libportal/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index 005bc21266529..0052f710a1d5e 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; version = "0.6"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optional (variant != "qt5") "devdoc"; src = fetchFromGitHub { owner = "flatpak"; @@ -62,12 +63,14 @@ stdenv.mkDerivation rec { gtk4 ] ++ lib.optionals (variant == "qt5") [ libsForQt5.qtbase + libsForQt5.qtx11extras ]; mesonFlags = [ "-Dbackends=${lib.optionalString (variant != null) variant}" "-Dvapi=${if variant != "qt5" then "true" else "false"}" "-Dintrospection=${if variant != "qt5" then "true" else "false"}" + "-Ddocs=${if variant != "qt5" then "true" else "false"}" # requires introspection=true ]; postFixup = '' @@ -75,6 +78,9 @@ stdenv.mkDerivation rec { moveToOutput "share/doc" "$devdoc" ''; + # we don't have any binaries + dontWrapQtApps = true; + meta = with lib; { description = "Flatpak portal library"; homepage = "https://github.com/flatpak/libportal"; |