gobject-introspection: 1.62.0 -> 1.64.0
- cairo and doctool is now auto features Disable broken test. It tries to look up libs in their installed location, which aren't accessible yet.
This commit is contained in:
parent
7b8546a26d
commit
990b331734
|
@ -7,17 +7,14 @@
|
||||||
# it may be worth thinking about using multiple derivation outputs
|
# it may be worth thinking about using multiple derivation outputs
|
||||||
# In that case its about 6MB which could be separated
|
# In that case its about 6MB which could be separated
|
||||||
|
|
||||||
let
|
|
||||||
pname = "gobject-introspection";
|
|
||||||
version = "1.62.0";
|
|
||||||
in
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "${pname}-${version}";
|
pname = "gobject-introspection";
|
||||||
|
version = "1.64.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi";
|
sha256 = "10pwykfnk7pw8k9k8iz3p72phxvyrh5q4d7gr3ysv08w15immh7a";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" "man" ];
|
outputs = [ "out" "dev" "man" ];
|
||||||
|
@ -32,6 +29,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"--datadir=${placeholder "dev"}/share"
|
"--datadir=${placeholder "dev"}/share"
|
||||||
|
"-Ddoctool=disabled"
|
||||||
|
"-Dcairo=disabled"
|
||||||
];
|
];
|
||||||
|
|
||||||
# outputs TODO: share/gobject-introspection-1.0/tests is needed during build
|
# outputs TODO: share/gobject-introspection-1.0/tests is needed during build
|
||||||
|
@ -56,6 +55,19 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
doCheck = !stdenv.isAarch64;
|
doCheck = !stdenv.isAarch64;
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
# Our gobject-introspection patches make the shared library paths absolute
|
||||||
|
# in the GIR files. When running tests, the library is not yet installed,
|
||||||
|
# though, so we need to replace the absolute path with a local one during build.
|
||||||
|
# We are using a symlink that we will delete before installation.
|
||||||
|
mkdir -p $out/lib
|
||||||
|
ln -s $PWD/tests/scanner/libregress-1.0.so $out/lib/libregress-1.0.so
|
||||||
|
cleanLibregressSymlink() {
|
||||||
|
rm $out/lib/libregress-1.0.so
|
||||||
|
}
|
||||||
|
preInstallPhases="$preInstallPhases cleanLibregressSymlink"
|
||||||
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = gnome3.updateScript {
|
updateScript = gnome3.updateScript {
|
||||||
packageName = pname;
|
packageName = pname;
|
||||||
|
|
Loading…
Reference in New Issue