diff options
-rw-r--r-- | pkgs/applications/window-managers/compiz/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/gnome/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/gnome/libwnck/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
4 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index c36fa1d67f7b..485f026078fe 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes , libXdamage, libXrandr, libXinerama, libICE, libSM -, startupnotification, libXrender, xextproto, mesa, gtk +, startupnotification, libXrender, xextproto, mesa, gtk, libwnck }: stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig libpng libXcomposite libXfixes libXdamage libXrandr libXinerama libICE libSM startupnotification libXrender xextproto - mesa gtk + mesa gtk libwnck ]; - configureFlags = "--disable-gconf"; + configureFlags = "--disable-gconf --enable-gtk"; } diff --git a/pkgs/development/libraries/gnome/default.nix b/pkgs/development/libraries/gnome/default.nix index 1a1b043ea938..6484f7adcfa3 100644 --- a/pkgs/development/libraries/gnome/default.nix +++ b/pkgs/development/libraries/gnome/default.nix @@ -165,7 +165,7 @@ rec { }; libwnck = (import ./libwnck) { - inherit fetchurl stdenv pkgconfig gtk; + inherit fetchurl stdenv pkgconfig gtk perl perlXMLParser gettext; input = desktop.libwnck; }; diff --git a/pkgs/development/libraries/gnome/libwnck/default.nix b/pkgs/development/libraries/gnome/libwnck/default.nix index 30fb217d4fa4..03912ef8044f 100644 --- a/pkgs/development/libraries/gnome/libwnck/default.nix +++ b/pkgs/development/libraries/gnome/libwnck/default.nix @@ -1,6 +1,6 @@ -{input, stdenv, fetchurl, pkgconfig, gtk}: +{input, stdenv, fetchurl, pkgconfig, gtk, perl, perlXMLParser, gettext}: stdenv.mkDerivation { inherit (input) name src; - buildInputs = [pkgconfig gtk]; + buildInputs = [pkgconfig gtk perl perlXMLParser gettext]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5706f15ad8b3..9242901b3a95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1239,7 +1239,8 @@ rec { }; cairo = import ../development/libraries/cairo { - inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng; + inherit fetchurl stdenv x11 fontconfig freetype zlib libpng; + pkgconfig = pkgconfig_latest; }; chmlib = import ../development/libraries/chmlib { @@ -1339,7 +1340,7 @@ rec { flex bison popt zlib libxml2 libxslt perl perlXMLParser docbook_xml_dtd_42 gettext x11 libtiff libjpeg libpng bzip2; - gtkLibs = gtkLibs28; + gtkLibs = gtkLibs210; # !!! correct? inherit (xlibs) libXmu; }); @@ -1347,7 +1348,7 @@ rec { inherit fetchurl stdenv libgpgerror gnupg; }; - gtkLibs = recurseIntoAttrs gtkLibs28 /* !!! -> gtkLibs10 */; + gtkLibs = recurseIntoAttrs gtkLibs210; gtkLibs1x = import ../development/libraries/gtk-libs-1.x { inherit fetchurl stdenv x11 libtiff libjpeg libpng; @@ -2541,7 +2542,7 @@ rec { inherit fetchurl stdenv pkgconfig libpng mesa; inherit (xorg) libXcomposite libXfixes libXdamage libXrandr libXinerama libICE libSM libXrender xextproto; - inherit (gnome) startupnotification; + inherit (gnome) startupnotification libwnck; inherit (gtkLibs) gtk; }; |