diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
| commit | 9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch) | |
| tree | 4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/development/libraries/libportal | |
| parent | a9cbfb6941b47d6f50129e6e36927882392daed7 (diff) | |
| parent | 2344fe1da14cb08b0c18743b207995f9b8597915 (diff) | |
| download | nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2 nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip | |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libportal')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libportal/default.nix | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libportal/default.nix b/nixpkgs/pkgs/development/libraries/libportal/default.nix index 0052f710a1d5..b5c06c609f30 100644 --- a/nixpkgs/pkgs/development/libraries/libportal/default.nix +++ b/nixpkgs/pkgs/development/libraries/libportal/default.nix @@ -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 = '' |