From 469db7ce0ec62294d31cb571107576d233584810 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Sep 2020 14:15:34 +0300 Subject: [PATCH] gobject-introspection: 1.64.1 -> 1.66.0 --- .../libraries/gobject-introspection/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 03b0d1767d9..9bac8bc71a1 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.64.1"; + version = "1.66.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"; + sha256 = "0q00llz0p7qik19a9fxq4bf6mqqqivkv77fqhcgqygvwxhxflrix"; }; patches = [ @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { bison gtk-doc docbook-xsl-nons - docbook_xml_dtd_43 # FIXME: remove in next release docbook_xml_dtd_45 python3 setupHook # move .gir files @@ -91,6 +90,12 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch64; + # During configurePhase, two python scripts are generated and need this. See + # https://github.com/NixOS/nixpkgs/pull/98316#issuecomment-695785692 + postConfigure = '' + patchShebangs tools/* + ''; + preCheck = '' # Our gobject-introspection patches make the shared library paths absolute # in the GIR files. When running tests, the library is not yet installed,