diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-10-19 14:40:23 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-01-07 10:22:32 +0000 |
| commit | cc62bcb55359ba8c5e0fe3a48e778444c89060d8 (patch) | |
| tree | ca0e21d44eaf8837b687395e614445f7761d7bbd /nixpkgs/pkgs/development/libraries/gcr | |
| parent | d6625e8d25efd829c3cfa227d025ca4e606ae4b7 (diff) | |
| parent | a323570a264da96a0b0bcc1c9aa017794acdc752 (diff) | |
| download | nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.gz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.bz2 nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.lz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.xz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.zst nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.zip | |
Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gcr')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gcr/default.nix | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gcr/default.nix b/nixpkgs/pkgs/development/libraries/gcr/default.nix index 37238a5f59ec..9c97faaa45cb 100644 --- a/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -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"; }; }; |