Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

libportal: 0.6 → 0.7.1

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>

+8 -17
+8 -17
pkgs/development/libraries/libportal/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , meson 6 5 , ninja 7 6 , pkg-config ··· 19 18 20 19 stdenv.mkDerivation rec { 21 20 pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; 22 - version = "0.6"; 21 + version = "0.7.1"; 23 22 24 23 outputs = [ "out" "dev" ] 25 24 ++ lib.optional (variant != "qt5") "devdoc"; ··· 28 27 owner = "flatpak"; 29 28 repo = "libportal"; 30 29 rev = version; 31 - sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A="; 30 + sha256 = "sha256-3roZJHnGFM7ClxbB7I/haexPTwYskidz9F+WV3RL9Ho="; 32 31 }; 33 32 34 - # TODO: remove on 0.7 35 - patches = [ 36 - # https://github.com/flatpak/libportal/pull/107 37 - (fetchpatch { 38 - name = "check-presence-of-sys-vfs-h.patch"; 39 - url = "https://github.com/flatpak/libportal/commit/e91a5d2ceb494ca0dd67295736e671b0142c7540.patch"; 40 - sha256 = "sha256-uFyhlU2fJgW4z0I31fABdc+pimLFYkqM4lggSIFs1tw="; 41 - }) 42 - ]; 43 - 44 33 depsBuildBuild = [ 45 34 pkg-config 46 35 ]; ··· 67 56 ]; 68 57 69 58 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 59 + (lib.mesonEnable "backend-gtk3" (variant == "gtk3")) 60 + (lib.mesonEnable "backend-gtk4" (variant == "gtk4")) 61 + (lib.mesonEnable "backend-qt5" (variant == "qt5")) 62 + (lib.mesonBool "vapi" (variant != "qt5")) 63 + (lib.mesonBool "introspection" (variant != "qt5")) 64 + (lib.mesonBool "docs" (variant != "qt5")) # requires introspection=true 74 65 ]; 75 66 76 67 postFixup = ''