diff options
| author | Tomasz Kontusz <tomasz.kontusz@gmail.com> | 2014-01-05 19:50:03 +0100 |
|---|---|---|
| committer | Tomasz Kontusz <tomasz.kontusz@gmail.com> | 2014-01-05 23:50:25 +0100 |
| commit | 14eba9f3f9231a4a4656e66826bc5fdeb9224bc1 (patch) | |
| tree | bf3521487b5caf0f916f409cb6074fa97a968d40 /pkgs/development | |
| parent | 053e029ee6b5d3ec4f14df0f0e4ea88f425075f6 (diff) | |
| download | nixpkgs-14eba9f3f9231a4a4656e66826bc5fdeb9224bc1.tar nixpkgs-14eba9f3f9231a4a4656e66826bc5fdeb9224bc1.tar.gz nixpkgs-14eba9f3f9231a4a4656e66826bc5fdeb9224bc1.tar.bz2 nixpkgs-14eba9f3f9231a4a4656e66826bc5fdeb9224bc1.tar.lz nixpkgs-14eba9f3f9231a4a4656e66826bc5fdeb9224bc1.tar.xz nixpkgs-14eba9f3f9231a4a4656e66826bc5fdeb9224bc1.tar.zst nixpkgs-14eba9f3f9231a4a4656e66826bc5fdeb9224bc1.zip | |
Bump libwnck3 and pygobject3, and enable introspection
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libwnck/3.x.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pygobject/3.nix | 10 |
3 files changed, 21 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 17393fab074..6c6c0812c43 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool}: stdenv.mkDerivation { - name = "libwnck-3.2.1"; + name = "libwnck-3.4.7"; src = fetchurl { - url = mirror://gnome/sources/libwnck/3.2/libwnck-3.2.1.tar.xz; - sha256 = "1nm34rpr0n559x1ba4kmxbhqclvvnlz0g8xqbbj709q9irnmifpa"; + url = mirror://gnome/sources/libwnck/3.4/libwnck-3.4.7.tar.xz; + sha256 = "d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723"; }; + patches = [ ./install_introspection_to_prefix.patch ]; + buildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ libX11 gtk3 ]; - - configureFlags = [ "--disable-introspection" ]; } diff --git a/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch b/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch new file mode 100644 index 00000000000..1bcf4a12ea3 --- /dev/null +++ b/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch @@ -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 diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index ffbe906a900..903db3e252c 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }: stdenv.mkDerivation rec { - name = "pygobject-3.0.4"; - + name = "pygobject-3.10.2"; + src = fetchurl { - url = "mirror://gnome/sources/pygobject/3.0/${name}.tar.xz"; - sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661"; + url = "mirror://gnome/sources/pygobject/3.10/${name}.tar.xz"; + sha256 = "75608f2c4052f0277508fc79debef026d9e84cb9261de2b922387c093d32c326"; }; - configureFlags = "--disable-introspection"; - buildInputs = [ python pkgconfig glib gobjectIntrospection pycairo cairo ]; meta = { |