JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump libwnck3 and pygobject3, and enable introspection

Browse Source
This commit is contained in:
Tomasz Kontusz 2014-01-05 19:50:03 +01:00
parent 053e029ee6
commit 14eba9f3f9
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libwnck/3.x.nix
View File

@ -1,15 +1,15 @@
{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool}: {stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libwnck-3.2.1"; name = "libwnck-3.4.7";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/libwnck/3.2/libwnck-3.2.1.tar.xz; url = mirror://gnome/sources/libwnck/3.4/libwnck-3.4.7.tar.xz;
sha256 = "1nm34rpr0n559x1ba4kmxbhqclvvnlz0g8xqbbj709q9irnmifpa"; sha256 = "d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723";
}; };
patches = [ ./install_introspection_to_prefix.patch ];
buildInputs = [ pkgconfig intltool ]; buildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ libX11 gtk3 ]; propagatedBuildInputs = [ libX11 gtk3 ];
configureFlags = [ "--disable-introspection" ];
} }

12
pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch Normal file
View File

@ -0,0 +1,12 @@
--- libwnck-3.4.7/configure 2013-08-20 14:46:14.000000000 +0000
+++ libwnck-3.4.7-fix/configure 2014-01-05 17:18:56.665427787 +0000
@@ -16150,7 +16150,7 @@ $as_echo "$found_introspection" >&6; }
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection

8
pkgs/development/python-modules/pygobject/3.nix
View File

@ -1,15 +1,13 @@
{ stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }: { stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pygobject-3.0.4"; name = "pygobject-3.10.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pygobject/3.0/${name}.tar.xz"; url = "mirror://gnome/sources/pygobject/3.10/${name}.tar.xz";
sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661"; sha256 = "75608f2c4052f0277508fc79debef026d9e84cb9261de2b922387c093d32c326";
}; };
configureFlags = "--disable-introspection";
buildInputs = [ python pkgconfig glib gobjectIntrospection pycairo cairo ]; buildInputs = [ python pkgconfig glib gobjectIntrospection pycairo cairo ];
meta = { meta = {