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>
This commit is contained in:
parent
7721e0d2c1
commit
2294cfeaf8
|
@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
|
||||||
pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
|
pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
|
||||||
version = "0.6";
|
version = "0.6";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
outputs = [ "out" "dev" ]
|
||||||
|
++ lib.optional (variant != "qt5") "devdoc";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "flatpak";
|
owner = "flatpak";
|
||||||
|
@ -62,12 +63,14 @@ stdenv.mkDerivation rec {
|
||||||
gtk4
|
gtk4
|
||||||
] ++ lib.optionals (variant == "qt5") [
|
] ++ lib.optionals (variant == "qt5") [
|
||||||
libsForQt5.qtbase
|
libsForQt5.qtbase
|
||||||
|
libsForQt5.qtx11extras
|
||||||
];
|
];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Dbackends=${lib.optionalString (variant != null) variant}"
|
"-Dbackends=${lib.optionalString (variant != null) variant}"
|
||||||
"-Dvapi=${if variant != "qt5" then "true" else "false"}"
|
"-Dvapi=${if variant != "qt5" then "true" else "false"}"
|
||||||
"-Dintrospection=${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 = ''
|
postFixup = ''
|
||||||
|
@ -75,6 +78,9 @@ stdenv.mkDerivation rec {
|
||||||
moveToOutput "share/doc" "$devdoc"
|
moveToOutput "share/doc" "$devdoc"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# we don't have any binaries
|
||||||
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Flatpak portal library";
|
description = "Flatpak portal library";
|
||||||
homepage = "https://github.com/flatpak/libportal";
|
homepage = "https://github.com/flatpak/libportal";
|
||||||
|
|
Loading…
Reference in a new issue