diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/libportal | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libportal')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libportal/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libportal/default.nix b/nixpkgs/pkgs/development/libraries/libportal/default.nix index 93ca52c243c6..0052f710a1d5 100644 --- a/nixpkgs/pkgs/development/libraries/libportal/default.nix +++ b/nixpkgs/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"; @@ -40,6 +41,10 @@ stdenv.mkDerivation rec { }) ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -58,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 = '' @@ -71,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"; |