about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2019-02-06 00:57:53 +0900
committerMatthieu Coudron <mattator@gmail.com>2019-02-12 11:47:54 +0900
commit71b2e1f554f0a4283aac173fd9426f7e640baf8e (patch)
treeba8618155250ba5712bbea1e24c163a71c9074c9 /pkgs
parentc01fe375ca192395af8ae8c575ff8eaa79ed03d8 (diff)
downloadnixlib-71b2e1f554f0a4283aac173fd9426f7e640baf8e.tar
nixlib-71b2e1f554f0a4283aac173fd9426f7e640baf8e.tar.gz
nixlib-71b2e1f554f0a4283aac173fd9426f7e640baf8e.tar.bz2
nixlib-71b2e1f554f0a4283aac173fd9426f7e640baf8e.tar.lz
nixlib-71b2e1f554f0a4283aac173fd9426f7e640baf8e.tar.xz
nixlib-71b2e1f554f0a4283aac173fd9426f7e640baf8e.tar.zst
nixlib-71b2e1f554f0a4283aac173fd9426f7e640baf8e.zip
luaPackages.lgi: move to generated
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/lua-modules/generated-packages.nix20
-rw-r--r--pkgs/development/lua-modules/overrides.nix11
-rw-r--r--pkgs/top-level/lua-packages.nix37
3 files changed, 31 insertions, 37 deletions
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index e974bf42bee7..b7224aa334db 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -150,6 +150,26 @@ inspect = buildLuarocksPackage {
     };
   };
 };
+lgi = buildLuarocksPackage {
+  pname = "lgi";
+  version = "0.9.2-1";
+
+  src =  fetchurl {
+      url    = https://luarocks.org/lgi-0.9.2-1.src.rock;
+      sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa";
+   };
+  disabled = ( luaOlder "5.1");
+  propagatedBuildInputs = [lua  ];
+  buildType="make";
+
+  meta = {
+    homepage = "http://github.com/pavouk/lgi";
+    description="Lua bindings to GObject libraries";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
 lpeg_patterns = buildLuarocksPackage {
   pname = "lpeg_patterns";
   version = "0.5-0";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 41b395d885b1..1fcc49bf5468 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -18,6 +18,17 @@ with super;
       '';
   });
 
+  lgi = super.lgi.overrideAttrs(oa: {
+    nativeBuildInputs = [ pkgs.pkgconfig ];
+    buildInputs = with pkgs; oa.buildInputs ++ [ glib gobjectIntrospection];
+    patches = [
+        (pkgs.fetchpatch {
+            name = "lgi-find-cairo-through-typelib.patch";
+            url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch";
+            sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c";
+        })
+    ];
+  });
 
   ltermbox = super.ltermbox.override( {
     disabled = !isLua51 || isLuaJIT;
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 8c039cbf3a2a..7a1738b0f3ee 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -871,43 +871,6 @@ with self; {
     };
   };
 
-  lgi = toLuaModule(stdenv.mkDerivation rec {
-    name = "lgi-${version}";
-    version = "0.9.2";
-
-    src = fetchFromGitHub {
-      owner = "pavouk";
-      repo = "lgi";
-      rev = version;
-      sha256 = "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj";
-    };
-
-    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ glib gobject-introspection lua ];
-
-    makeFlags = [ "LUA_VERSION=${lua.luaversion}" ];
-
-    preBuild = ''
-      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;
-      license     = licenses.mit;
-      maintainers = with maintainers; [ lovek323 rasendubi ];
-      platforms   = platforms.unix;
-    };
-  });
-
   mpack = buildLuaPackage rec {
     name = "mpack-${version}";
     version = "1.0.7";