From c0c835dccee7d05df14d424eb7a4fbb9bd3684da Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 14 Mar 2014 12:09:05 +0000 Subject: [PATCH] keybinder: add gtk3 support --- pkgs/development/libraries/keybinder/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 20e2cd2218f..96a3c9a3a8d 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome_common -, gtk_doc, gtk2, python, pygtk, pygobject, lua +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk +, gtk_doc, gtk2, python, pygtk3, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - autoconf automake libtool pkgconfig gnome_common gtk_doc gtk2 - python pygtk pygobject lua + autoconf automake libtool pkgconfig gnome3.gnome_common gtk_doc gnome3.gtk3 + python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2 ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bb7acfba1f..71b50043f11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4596,7 +4596,6 @@ let judy = callPackage ../development/libraries/judy { }; keybinder = callPackage ../development/libraries/keybinder { - inherit (gnome2) gnome_common; automake = automake111x; lua = lua5_1; };