public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88598 from betaboon/xdg-desktop-portal-172

Browse Source 
xdg-desktop-portal: 1.6.0 -> 1.7.2
This commit is contained in:
Florian Klink 2020-06-24 09:45:20 +02:00 committed by GitHub
commit 5897105701
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gtk"; pname = "xdg-desktop-portal-gtk";
version = "1.6.0"; version = "1.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flatpak"; owner = "flatpak";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1gpbjkfkrpk96krc1zbccrq7sih282mg303ifxaaxbnj6d8drm5h"; sha256 = "183iha9dxmvprn99ymgz17jx1lyn1fj5jyj6ghxl716zn9mxmird";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

12
pkgs/development/libraries/xdg-desktop-portal/default.nix
View File

@ -6,7 +6,7 @@
, pkgconfig , pkgconfig
, libxml2 , libxml2
, glib , glib
, pipewire_0_2 , pipewire
, fontconfig , fontconfig
, flatpak , flatpak
, gsettings-desktop-schemas , gsettings-desktop-schemas
@ -21,7 +21,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xdg-desktop-portal"; pname = "xdg-desktop-portal";
version = "1.6.0"; version = "1.7.2";
outputs = [ "out" "installedTests" ]; outputs = [ "out" "installedTests" ];
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "flatpak"; owner = "flatpak";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0fbsfpilwbv7j6cimsmmz6g0r96bw0ziwyk9z4zg2rd1mfkmmp9a"; sha256 = "0rkwpsmbn3d3spkzc2zsd50l2r8pp4la390zcpsawaav8w7ql7xm";
}; };
patches = [ patches = [
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
pipewire_0_2 pipewire
fontconfig fontconfig
flatpak flatpak
acl acl
@ -61,10 +61,6 @@ stdenv.mkDerivation rec {
json-glib json-glib
]; ];
# Seems to get stuck after "PASS: test-portals 39 /portal/inhibit/monitor"
# TODO: investigate!
doCheck = false;
configureFlags = [ configureFlags = [
"--enable-installed-tests" "--enable-installed-tests"
]; ];