nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-20 23:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

libportal: 0.6 → 0.7.1

Browse Source 
https://github.com/flatpak/libportal/releases/tag/0.7
https://github.com/flatpak/libportal/releases/tag/0.7.1
https://github.com/flatpak/libportal/compare/0.6...0.7.1

- New portals.
- Option names changed.

Let’s use functions to make the feature configuration cleaner.

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Jan Tojnar
2023-11-20 01:07:16 +01:00
parent f962d04ed3
commit 3b45e2be92
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/libportal/default.nix
View File

@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, meson
, ninja
, pkg-config
@@ -19,7 +18,7 @@ assert variant == null || variant == "gtk3" || variant == "gtk4" || variant == "
stdenv.mkDerivation rec {
pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
version = "0.6";
version = "0.7.1";
outputs = [ "out" "dev" ]
++ lib.optional (variant != "qt5") "devdoc";
@@ -28,19 +27,9 @@ stdenv.mkDerivation rec {
owner = "flatpak";
repo = "libportal";
rev = version;
sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A=";
sha256 = "sha256-3roZJHnGFM7ClxbB7I/haexPTwYskidz9F+WV3RL9Ho=";
};
# TODO: remove on 0.7
patches = [
# https://github.com/flatpak/libportal/pull/107
(fetchpatch {
name = "check-presence-of-sys-vfs-h.patch";
url = "https://github.com/flatpak/libportal/commit/e91a5d2ceb494ca0dd67295736e671b0142c7540.patch";
sha256 = "sha256-uFyhlU2fJgW4z0I31fABdc+pimLFYkqM4lggSIFs1tw=";
})
];
depsBuildBuild = [
pkg-config
];
@@ -67,10 +56,12 @@ stdenv.mkDerivation rec {
];
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
(lib.mesonEnable "backend-gtk3" (variant == "gtk3"))
(lib.mesonEnable "backend-gtk4" (variant == "gtk4"))
(lib.mesonEnable "backend-qt5" (variant == "qt5"))
(lib.mesonBool "vapi" (variant != "qt5"))
(lib.mesonBool "introspection" (variant != "qt5"))
(lib.mesonBool "docs" (variant != "qt5")) # requires introspection=true
];
postFixup = ''