pyrox.dev
Merge pull request #232694 from Scrumplex/libportal-qt5-zhf
libportal: fix build for qt5 variant
authored by
Stanisław Pitucha
and committed by
GitHub
08acd91f
2ab106dd
+7
-1
pkgs/development/libraries/libportal/default.nix
+7
-1
pkgs/development/libraries/libportal/default.nix
···
21
pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
22
version = "0.6";
23
24
-
outputs = [ "out" "dev" "devdoc" ];
25
26
src = fetchFromGitHub {
27
owner = "flatpak";
···
62
gtk4
63
] ++ lib.optionals (variant == "qt5") [
64
libsForQt5.qtbase
65
];
66
67
mesonFlags = [
68
"-Dbackends=${lib.optionalString (variant != null) variant}"
69
"-Dvapi=${if variant != "qt5" then "true" else "false"}"
70
"-Dintrospection=${if variant != "qt5" then "true" else "false"}"
71
];
72
73
postFixup = ''
74
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
75
moveToOutput "share/doc" "$devdoc"
76
'';
77
78
meta = with lib; {
79
description = "Flatpak portal library";
···
21
pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
22
version = "0.6";
23
24
+
outputs = [ "out" "dev" ]
25
+
++ lib.optional (variant != "qt5") "devdoc";
26
27
src = fetchFromGitHub {
28
owner = "flatpak";
···
63
gtk4
64
] ++ lib.optionals (variant == "qt5") [
65
libsForQt5.qtbase
66
+
libsForQt5.qtx11extras
67
];
68
69
mesonFlags = [
70
"-Dbackends=${lib.optionalString (variant != null) variant}"
71
"-Dvapi=${if variant != "qt5" then "true" else "false"}"
72
"-Dintrospection=${if variant != "qt5" then "true" else "false"}"
73
+
"-Ddocs=${if variant != "qt5" then "true" else "false"}" # requires introspection=true
74
];
75
76
postFixup = ''
77
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
78
moveToOutput "share/doc" "$devdoc"
79
'';
80
+
81
+
# we don't have any binaries
82
+
dontWrapQtApps = true;
83
84
meta = with lib; {
85
description = "Flatpak portal library";