nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187316 from jtojnar/gcr

Browse Source 
gcr: 3.41.0 → 3.41.1
This commit is contained in:
Jan Tojnar 2022-08-19 13:30:02 +02:00 committed by GitHub
commit 495b19d5b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/development/libraries/gcr/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv { stdenv
, lib
, fetchurl , fetchurl
, fetchpatch
, pkg-config , pkg-config
, meson , meson
, ninja , ninja
@ -17,7 +17,7 @@
, systemd , systemd
, gobject-introspection , gobject-introspection
, wrapGAppsHook , wrapGAppsHook
, libxslt , gi-docgen
, vala , vala
, gnome , gnome
, python3 , python3
@ -26,25 +26,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gcr"; pname = "gcr";
version = "3.41.0"; version = "3.41.1";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE="; sha256 = "u3Eoo8L+u/7pwDuQ131JjQzrI3sHiYAtYBhcccS+ok8=";
}; };
patches = [
# Pull upstream fix for meson-0.60:
# https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81
(fetchpatch {
name = "meson-0.60.patch";
url = "https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch";
sha256 = "15gwxkcm5q5p87p5lrqwgykpzx5gmk179xd3481yak93yhbvy165";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
meson meson
@ -52,7 +42,7 @@ stdenv.mkDerivation rec {
ninja ninja
gettext gettext
gobject-introspection gobject-introspection
libxslt gi-docgen
wrapGAppsHook wrapGAppsHook
vala vala
shared-mime-info shared-mime-info
@ -65,6 +55,7 @@ stdenv.mkDerivation rec {
pango pango
libsecret libsecret
openssh openssh
] ++ lib.optionals stdenv.isLinux [
systemd systemd
]; ];
@ -79,10 +70,11 @@ stdenv.mkDerivation rec {
]; ];
mesonFlags = [ mesonFlags = [
"-Dgtk_doc=false"
# We are still using ssh-agent from gnome-keyring. # We are still using ssh-agent from gnome-keyring.
# https://github.com/NixOS/nixpkgs/issues/140824 # https://github.com/NixOS/nixpkgs/issues/140824
"-Dssh_agent=false" "-Dssh_agent=false"
] ++ lib.optionals (!stdenv.isLinux) [
"-Dsystemd=disabled"
]; ];
doCheck = false; # fails 21 out of 603 tests, needs dbus daemon doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
@ -90,15 +82,22 @@ stdenv.mkDerivation rec {
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
postPatch = '' postPatch = ''
patchShebangs build/ gcr/fixtures/ patchShebangs gcr/fixtures/
chmod +x meson_post_install.py chmod +x meson_post_install.py
patchShebangs meson_post_install.py patchShebangs meson_post_install.py
substituteInPlace meson_post_install.py --replace ".so" "${stdenv.hostPlatform.extensions.sharedLibrary}"
'';
postFixup = ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput "share/doc" "$devdoc"
''; '';
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;
freeze = true;
}; };
}; };