diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-04 11:50:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-04 11:51:33 +0100 |
| commit | cc0f942aec8d79c79cea81d81b29fdd3fd5781e1 (patch) | |
| tree | f2fcd3ad0e4c37af7e2913dfdd1ba33182f54491 | |
| parent | 4b3f0d8873bed1d4252217cbc215b9ac679d7cf5 (diff) | |
| parent | 718552eca4196dcc9d20bd2c24a7f1e2857e6518 (diff) | |
| download | nixpkgs-cc0f942aec8d79c79cea81d81b29fdd3fd5781e1.tar nixpkgs-cc0f942aec8d79c79cea81d81b29fdd3fd5781e1.tar.gz nixpkgs-cc0f942aec8d79c79cea81d81b29fdd3fd5781e1.tar.bz2 nixpkgs-cc0f942aec8d79c79cea81d81b29fdd3fd5781e1.tar.lz nixpkgs-cc0f942aec8d79c79cea81d81b29fdd3fd5781e1.tar.xz nixpkgs-cc0f942aec8d79c79cea81d81b29fdd3fd5781e1.tar.zst nixpkgs-cc0f942aec8d79c79cea81d81b29fdd3fd5781e1.zip | |
Merge #34584: lgi: Fix cairo bindings search path
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index b91f9dae9f0..d80c43b03f5 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -9,7 +9,7 @@ , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , mysql, postgresql, cyrus_sasl -, fetchFromGitHub, libmpack, which +, fetchFromGitHub, libmpack, which, fetchpatch }: let @@ -671,6 +671,14 @@ let sed -i "s|/usr/local|$out|" lgi/Makefile ''; + patches = [ + (fetchpatch { + name = "lgi-find-cairo-through-typelib.patch"; + url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; + sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; + }) + ]; + meta = with stdenv.lib; { description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; homepage = https://github.com/pavouk/lgi; |