Merge pull request #34081 from jtojnar/gir-abs-cairo

gobjectIntrospection: use absolute path for cairo GIR
This commit is contained in:
Frederik Rietdijk 2018-01-24 20:59:16 +00:00 committed by GitHub
commit bf87e56cda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions

View file

@ -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"

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
, libintlOrEmpty, cctools
, libintlOrEmpty, cctools, cairo
, substituteAll, nixStoreDir ? builtins.storeDir
}:
# now that gobjectIntrospection creates large .gir files (eg gtk3 case)
@ -38,10 +38,17 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
patches = stdenv.lib.singleton (substituteAll {
src = ./absolute_shlib_path.patch;
inherit nixStoreDir;
});
patches = [
(substituteAll {
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; {
description = "A middleware layer between C libraries and language bindings";