Merge pull request #34081 from jtojnar/gir-abs-cairo
gobjectIntrospection: use absolute path for cairo GIR
This commit is contained in:
commit
bf87e56cda
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/gir/cairo-1.0.gir.in
|
||||||
|
+++ b/gir/cairo-1.0.gir.in
|
||||||
|
@@ -5,7 +5,7 @@
|
||||||
|
xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
|
||||||
|
<package name="%CAIRO_GIR_PACKAGE%"/>
|
||||||
|
<namespace name="cairo" version="1.0"
|
||||||
|
- shared-library="%CAIRO_SHARED_LIBRARY%"
|
||||||
|
+ shared-library="@cairoLib@/%CAIRO_SHARED_LIBRARY%"
|
||||||
|
c:identifier-prefixes="cairo"
|
||||||
|
c:symbol-prefixes="cairo">
|
||||||
|
<record name="Context" c:type="cairo_t" foreign="1"
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
|
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
|
||||||
, libintlOrEmpty, cctools
|
, libintlOrEmpty, cctools, cairo
|
||||||
, substituteAll, nixStoreDir ? builtins.storeDir
|
, substituteAll, nixStoreDir ? builtins.storeDir
|
||||||
}:
|
}:
|
||||||
# now that gobjectIntrospection creates large .gir files (eg gtk3 case)
|
# now that gobjectIntrospection creates large .gir files (eg gtk3 case)
|
||||||
|
@ -38,10 +38,17 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
patches = stdenv.lib.singleton (substituteAll {
|
patches = [
|
||||||
src = ./absolute_shlib_path.patch;
|
(substituteAll {
|
||||||
inherit nixStoreDir;
|
src = ./absolute_shlib_path.patch;
|
||||||
});
|
inherit nixStoreDir;
|
||||||
|
})
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/34080
|
||||||
|
(substituteAll {
|
||||||
|
src = ./absolute_gir_path.patch;
|
||||||
|
cairoLib = "${getLib cairo}/lib";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A middleware layer between C libraries and language bindings";
|
description = "A middleware layer between C libraries and language bindings";
|
||||||
|
|
Loading…
Reference in a new issue