From bb1355a22dbab890b01ed9c94f75b0c5572d3709 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 14 May 2021 15:50:43 +0200 Subject: [PATCH] =?UTF-8?q?libportal:=200.3=20=E2=86=92=200.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/libportal/default.nix | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index 5eacdaa8f3c..97c5303eabe 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libportal"; - version = "0.3"; + version = "0.4"; outputs = [ "out" "dev" "devdoc" ]; @@ -20,22 +20,9 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1s3g17zbbmq3m5jfs62fl94p4irln9hfhpybj7jb05z0p1939rk3"; + sha256 = "fuYZWGkdazq6H0rThqpF6KIcvwgc17o+CiISb1LjBso="; }; - patches = [ - # Fix build and .pc file - # https://github.com/flatpak/libportal/pull/20 - (fetchpatch { - url = "https://github.com/flatpak/libportal/commit/7828be4ec8f05f8de7b129a1e35b5039d8baaee3.patch"; - sha256 = "04nadcxx69mbnzljwjrzm88cgapn14x3mghpkhr8b9yrjn7yj86h"; - }) - (fetchpatch { - url = "https://github.com/flatpak/libportal/commit/bf5de2f6fefec65f701b4ec8712b48b29a33fb71.patch"; - sha256 = "1v0b09diq49c01j5gg2bpvn5f5gfw1a5nm1l8grc4qg4z9jck1z8"; - }) - ]; - nativeBuildInputs = [ meson ninja