Unverified Commit 2294cfea authored by Sefa Eyeoglu's avatar Sefa Eyeoglu
Browse files

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: default avatarSefa Eyeoglu <contact@scrumplex.net>
parent 7721e0d2

pkgs/development/libraries/libportal/default.nix

+7 −1
Original line number Diff line number Diff line
@@ -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";