gobjectIntrospection: 1.56.0 → 1.58.1
Upstream now strips absolute paths to their basename on all platforms apart from Darwin: https://gitlab.gnome.org/GNOME/gobject-introspection/commit/a41abe1868a693387cd5cf85567cf2e0fd6c62df To get around this without modifying the basename test we simply pass in `basename=False` when normally generating gir files.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
|
||||
, libintl, cctools, cairo, gnome3
|
||||
{ stdenv, fetchurl, glib, flex, bison, meson, ninja, pkgconfig, libffi, python3
|
||||
, libintl, cctools, cairo, gnome3, glibcLocales, fetchpatch
|
||||
, substituteAll, nixStoreDir ? builtins.storeDir
|
||||
, x11Support ? true
|
||||
}:
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
let
|
||||
pname = "gobject-introspection";
|
||||
version = "1.56.0";
|
||||
version = "1.58.1";
|
||||
in
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -17,21 +17,22 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d";
|
||||
sha256 = "12fzs3044047icdfs7cb2lsmnfi6w6fyhkci3m2rbvf5llgnhm29";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
outputBin = "dev";
|
||||
outputMan = "dev"; # tiny pages
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libintl ];
|
||||
buildInputs = [ flex bison python setupHook/*move .gir*/ ]
|
||||
LC_ALL = "en_US.UTF-8"; # for tests
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig libintl glibcLocales ];
|
||||
buildInputs = [ flex bison python3 setupHook/*move .gir*/ ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin cctools;
|
||||
propagatedBuildInputs = [ libffi glib ];
|
||||
|
||||
preConfigure = ''
|
||||
sed 's|/usr/bin/env ||' -i tools/g-ir-tool-template.in
|
||||
'';
|
||||
mesonFlags = [
|
||||
"--datadir=${placeholder "dev"}/share"
|
||||
];
|
||||
|
||||
# outputs TODO: share/gobject-introspection-1.0/tests is needed during build
|
||||
# by pygobject3 (and maybe others), but it's only searched in $out
|
||||
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
cairoLib = "${getLib cairo}/lib";
|
||||
});
|
||||
|
||||
doCheck = false; # fails
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
|
||||
Reference in New Issue
Block a user