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
+7 -1
pkgs/development/libraries/libportal/default.nix
··· 21 21 pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; 22 22 version = "0.6"; 23 23 24 - outputs = [ "out" "dev" "devdoc" ]; 24 + outputs = [ "out" "dev" ] 25 + ++ lib.optional (variant != "qt5") "devdoc"; 25 26 26 27 src = fetchFromGitHub { 27 28 owner = "flatpak"; ··· 62 63 gtk4 63 64 ] ++ lib.optionals (variant == "qt5") [ 64 65 libsForQt5.qtbase 66 + libsForQt5.qtx11extras 65 67 ]; 66 68 67 69 mesonFlags = [ 68 70 "-Dbackends=${lib.optionalString (variant != null) variant}" 69 71 "-Dvapi=${if variant != "qt5" then "true" else "false"}" 70 72 "-Dintrospection=${if variant != "qt5" then "true" else "false"}" 73 + "-Ddocs=${if variant != "qt5" then "true" else "false"}" # requires introspection=true 71 74 ]; 72 75 73 76 postFixup = '' 74 77 # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. 75 78 moveToOutput "share/doc" "$devdoc" 76 79 ''; 80 + 81 + # we don't have any binaries 82 + dontWrapQtApps = true; 77 83 78 84 meta = with lib; { 79 85 description = "Flatpak portal library";