mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
xdg-desktop-portal: 1.0.3 -> 1.1.0
Do not add geoclue dependency yet: Complains it's not new enough, apparently wants an untagged version (2.5.1 is latest tag) checking for libgeoclue-2.0 >= 2.5.2... no configure: error: Package requirements (libgeoclue-2.0 >= 2.5.2) were not met: Requested 'libgeoclue-2.0 >= 2.5.2' but version of Geoclue Client Library is 2.5.1
This commit is contained in:
parent
1e5c28f2b9
commit
a17933be4d
1 changed files with 15 additions and 10 deletions
|
@ -1,30 +1,35 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, acl, dbus, fuse, wrapGAppsHook, gnome3 }:
|
||||
|
||||
let
|
||||
version = "1.0.3";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "xdg-desktop-portal-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal";
|
||||
version = "1.1.0";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flatpak";
|
||||
repo = "xdg-desktop-portal";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "113k5sr4l58rm8sgp4qbjrhyjg37c5ad54i58njsm98knb5r2ppv";
|
||||
sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./respect-path-env-var.patch
|
||||
# https://github.com/flatpak/xdg-desktop-portal/pull/263
|
||||
(fetchpatch {
|
||||
url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch;
|
||||
sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 ];
|
||||
buildInputs = [ glib pipewire fuse ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ];
|
||||
buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gnome3.gsettings-desktop-schemas ];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = true; # XXX: investigate!
|
||||
|
||||
configureFlags = [
|
||||
"--enable-installed-tests"
|
||||
"--disable-geoclue" # Requires 2.5.2, not released yet
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
|
|
Loading…
Reference in a new issue