lol

Bump libwnck3 and pygobject3, and enable introspection

+21 -11
+5 -5
pkgs/development/libraries/libwnck/3.x.nix
··· 1 1 {stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool}: 2 2 3 3 stdenv.mkDerivation { 4 - name = "libwnck-3.2.1"; 4 + name = "libwnck-3.4.7"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/libwnck/3.2/libwnck-3.2.1.tar.xz; 8 - sha256 = "1nm34rpr0n559x1ba4kmxbhqclvvnlz0g8xqbbj709q9irnmifpa"; 7 + url = mirror://gnome/sources/libwnck/3.4/libwnck-3.4.7.tar.xz; 8 + sha256 = "d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723"; 9 9 }; 10 + 11 + patches = [ ./install_introspection_to_prefix.patch ]; 10 12 11 13 buildInputs = [ pkgconfig intltool ]; 12 14 propagatedBuildInputs = [ libX11 gtk3 ]; 13 - 14 - configureFlags = [ "--disable-introspection" ]; 15 15 }
+12
pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch
··· 1 + --- libwnck-3.4.7/configure 2013-08-20 14:46:14.000000000 +0000 2 + +++ libwnck-3.4.7-fix/configure 2014-01-05 17:18:56.665427787 +0000 3 + @@ -16150,7 +16150,7 @@ $as_echo "$found_introspection" >&6; } 4 + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` 5 + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` 6 + - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` 7 + + INTROSPECTION_GIRDIR="${datadir}/gir-1.0" 8 + - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" 9 + + INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" 10 + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` 11 + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` 12 + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+4 -6
pkgs/development/python-modules/pygobject/3.nix
··· 1 1 { stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "pygobject-3.0.4"; 5 - 4 + name = "pygobject-3.10.2"; 5 + 6 6 src = fetchurl { 7 - url = "mirror://gnome/sources/pygobject/3.0/${name}.tar.xz"; 8 - sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661"; 7 + url = "mirror://gnome/sources/pygobject/3.10/${name}.tar.xz"; 8 + sha256 = "75608f2c4052f0277508fc79debef026d9e84cb9261de2b922387c093d32c326"; 9 9 }; 10 - 11 - configureFlags = "--disable-introspection"; 12 10 13 11 buildInputs = [ python pkgconfig glib gobjectIntrospection pycairo cairo ]; 14 12