gcr: 3.40.0 → 3.41.0
This commit is contained in:
parent
15816fe142
commit
44c652961b
@ -11,6 +11,9 @@
|
||||
, libtasn1
|
||||
, gtk3
|
||||
, pango
|
||||
, libsecret
|
||||
, openssh
|
||||
, systemd
|
||||
, gobject-introspection
|
||||
, makeWrapper
|
||||
, libxslt
|
||||
@ -22,22 +25,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcr";
|
||||
version = "3.40.0";
|
||||
version = "3.41.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U=";
|
||||
sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build/ gcr/fixtures/
|
||||
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
meson
|
||||
@ -56,6 +52,9 @@ stdenv.mkDerivation rec {
|
||||
libgcrypt
|
||||
libtasn1
|
||||
pango
|
||||
libsecret
|
||||
openssh
|
||||
systemd
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -70,10 +69,22 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=false"
|
||||
# We are still using ssh-agent from gnome-keyring.
|
||||
# https://github.com/NixOS/nixpkgs/issues/140824
|
||||
"-Dssh_agent=false"
|
||||
];
|
||||
|
||||
doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
|
||||
|
||||
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build/ gcr/fixtures/
|
||||
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/gcr-viewer" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
@ -82,7 +93,6 @@ stdenv.mkDerivation rec {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user