alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Get rid of most references to gtkLibs

Browse source 
svn path=/nixpkgs/trunk/; revision=33088
This commit is contained in:
Yury G. Kudryashov 2012-03-14 21:57:32 +00:00
parent fd1867ec92
commit 68fe867e19
20 changed files with 52 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/graphics/gimp/plugins/default.nix
View file

@ -5,8 +5,7 @@
{ pkgs, gimp }: { pkgs, gimp }:
let let
inherit (pkgs) stdenv fetchurl pkgconfig gtkLibs; inherit (pkgs) stdenv fetchurl pkgconfig glib;
inherit (gtkLibs) glib;
targetPluginDir = "$out/${gimp.name}-plugins"; targetPluginDir = "$out/${gimp.name}-plugins";
targetScriptDir = "$out/${gimp.name}-scripts"; targetScriptDir = "$out/${gimp.name}-scripts";
prefix = "plugin-gimp-"; prefix = "plugin-gimp-";

14
pkgs/applications/graphics/k3d/default.nix
View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, gtkLibs, gnome {stdenv, fetchurl
, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl , gettext, intltool, perl, gtkmm, glibmm, gtkglext
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.8.0.2"; version = "0.8.0.2";
name = "k3d-${version}"; name = "k3d-${version}";
src = fetchurl { src = fetchurl {
url = "http://downloads.sourceforge.net/project/k3d/K-3D%20Source/K-3D%200.8.0.2/k3d-source-0.8.0.2.tar.bz2"; url = "mirror://sourceforge/k3d/k3d-source-0.8.0.2.tar.bz2";
sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x"; sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x";
}; };
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
''; '';
buildInputs = with gtkLibs; with gnome; [ buildInputs = [
cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext
intltool perl intltool perl

11
pkgs/applications/misc/adobe-reader/default.nix
View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, libX11, cups, gtkLibs, zlib, libxml2 }: { stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk, glib
, gdk_pixbuf }:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
@ -17,13 +18,7 @@ stdenv.mkDerivation {
# versions. # versions.
libPath = stdenv.lib.makeLibraryPath libPath = stdenv.lib.makeLibraryPath
[ stdenv.gcc.gcc libX11 zlib libxml2 cups [ stdenv.gcc.gcc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ];
gtkLibs.pango
gtkLibs.atk
gtkLibs.gtk
gtkLibs.glib
gtkLibs.gdk_pixbuf
];
meta = { meta = {
description = "Adobe Reader, a viewer for PDF documents"; description = "Adobe Reader, a viewer for PDF documents";

5
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -1,5 +1,6 @@
{ GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat { GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat
, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11, libXfixes , fetchurl, ffmpeg, fontconfig, freetype, libX11, libXfixes
, glib, gtk, gdk_pixbuf, pango
, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst , libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
, libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
, stdenv, unzip, zlib, pam, pcre }: , stdenv, unzip, zlib, pam, pcre }:
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes
libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango glib gtk gdk_pixbuf pango
pam pam
]; ];

6
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
View file

@ -21,9 +21,9 @@ let
]; ];
rpath32 = makeLibraryPath rpath32 = makeLibraryPath
[ pkgsi686Linux.gtkLibs.gdk_pixbuf [ pkgsi686Linux.gdk_pixbuf
pkgsi686Linux.gtkLibs.glib pkgsi686Linux.glib
pkgsi686Linux.gtkLibs.gtk pkgsi686Linux.gtk
pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libX11
pkgsi686Linux.xorg.libXcomposite pkgsi686Linux.xorg.libXcomposite
pkgsi686Linux.xorg.libXfixes pkgsi686Linux.xorg.libXfixes

9
pkgs/applications/networking/dropbox/default.nix
View file

@ -1,6 +1,8 @@
{ stdenv, fetchurl, makeDesktopItem { stdenv, fetchurl, makeDesktopItem
, xlibs, gtkLibs, gnome , libSM, libX11, libXext, libXcomposite, libXcursor, libXdamage
, libXfixes, libXi, libXinerama, libXrandr, libXrender
, dbus, dbus_glib, fontconfig, gcc, patchelf , dbus, dbus_glib, fontconfig, gcc, patchelf
, atk, glib, gdk_pixbuf, gtk, pango
}: }:
# this package contains the daemon version of dropbox # this package contains the daemon version of dropbox
@ -28,8 +30,7 @@ let
# Libraries referenced by dropbox binary. # Libraries referenced by dropbox binary.
# Be aware that future versions of the dropbox binary may refer # Be aware that future versions of the dropbox binary may refer
# to different versions than are currently in these packages. # to different versions than are currently in these packages.
ldpath = with xlibs; with gtkLibs; with gnome; ldpath = stdenv.lib.makeSearchPath "lib" [
stdenv.lib.makeSearchPath "lib" [
libSM libX11 libXext libXcomposite libXcursor libXdamage libSM libX11 libXext libXcomposite libXcursor libXdamage
libXfixes libXi libXinerama libXrandr libXrender libXfixes libXi libXinerama libXrandr libXrender
atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf
@ -83,4 +84,4 @@ in stdenv.mkDerivation {
description = "Online stored folders (daemon version)"; description = "Online stored folders (daemon version)";
homepage = http://www.dropbox.com; homepage = http://www.dropbox.com;
}; };
} }

6
pkgs/applications/networking/instant-messengers/oneteam/default.nix
View file

@ -1,16 +1,16 @@
x@{builderDefsPackage x@{builderDefsPackage
, fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
, pulseaudio, gtkLibs, pixman, nspr, nss, libXScrnSaver, scrnsaverproto , pulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
["fetchgit" "perlPackages" "gtkLibs"]; ["fetchgit" "perlPackages"];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames)) ++ [ (builtins.attrNames (builtins.removeAttrs x helperArgNames)) ++ [
a.perlPackages.SubName a.gtkLibs.gtk a.gtkLibs.glib a.perlPackages.SubName a.gtk a.glib
]; ];
sourceInfo = rec { sourceInfo = rec {
baseName="oneteam"; baseName="oneteam";

2
pkgs/desktops/xfce-4.6/default.nix
View file

@ -1,7 +1,7 @@
{ callPackage, pkgs }: { callPackage, pkgs }:
rec { rec {
inherit (pkgs.gtkLibs) gtk glib; inherit (pkgs) gtk glib;
#### CORE #### CORE

2
pkgs/desktops/xfce-4.8/default.nix
View file

@ -1,7 +1,7 @@
{ callPackage, pkgs }: { callPackage, pkgs }:
rec { rec {
inherit (pkgs.gtkLibs) gtk glib; inherit (pkgs) gtk glib;
#### SUPPORT #### SUPPORT

4
pkgs/misc/emulators/gens-gs/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtkLibs, SDL, nasm, zlib, libpng, mesa }: { stdenv, fetchurl, pkgconfig, gtk, SDL, nasm, zlib, libpng, mesa }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gens-gs-7"; name = "gens-gs-7";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833";
}; };
buildInputs = [ pkgconfig gtkLibs.gtk SDL nasm zlib libpng mesa ]; buildInputs = [ pkgconfig gtk SDL nasm zlib libpng mesa ];
# Work around build failures on recent GTK+. # Work around build failures on recent GTK+.
# See http://ubuntuforums.org/showthread.php?p=10535837 # See http://ubuntuforums.org/showthread.php?p=10535837

4
pkgs/misc/emulators/mess/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtkLibs, gnome, mesa { stdenv, fetchurl, unzip, pkgconfig, SDL, gtk, GConf, mesa
, expat, zlib }: , expat, zlib }:
let let
@ -32,7 +32,7 @@ stdenv.mkDerivation {
makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1"; makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1";
buildInputs = buildInputs =
[ unzip pkgconfig SDL gtkLibs.gtk gnome.GConf mesa expat zlib ]; [ unzip pkgconfig SDL gtk GConf mesa expat zlib ];
installPhase = installPhase =
'' ''

4
pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, { stdenv, fetchurl,
cmake, dbus_glib, glib, gtk, gtkLibs, pkgconfig, xorg }: cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.1"; version = "1.1.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "66d571f08ec999f56de412f42a0395c9dc60b73adaaece96c6da6e98353fe379"; sha256 = "66d571f08ec999f56de412f42a0395c9dc60b73adaaece96c6da6e98353fe379";
}; };
buildInputs = [ cmake dbus_glib glib gtk gtkLibs.gdk_pixbuf buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs
xorg.libxcb xorg.pixman ]; xorg.libxcb xorg.pixman ];

5
pkgs/os-specific/linux/nvidia-x11/default.nix
View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, kernel ? null, xlibs, gtkLibs, zlib, perl { stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
, gtk, atk, pango, glib, gdk_pixbuf
, # Whether to build the libraries only (i.e. not the kernel module or , # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit # nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux. # Linux.
@ -38,7 +39,7 @@ stdenv.mkDerivation {
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
[ gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib gtkLibs.gdk_pixbuf xlibs.libXv ] ); [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );
buildInputs = [ perl ]; buildInputs = [ perl ];

7
pkgs/os-specific/linux/nvidia-x11/legacy173.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}: {stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib}:
let let
@ -32,10 +32,7 @@ stdenv.mkDerivation {
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
programPath = stdenv.lib.makeLibraryPath [ programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib xlibs.libXv ];
gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib
xlibs.libXv
];
meta = { meta = {
homepage = http://www.nvidia.com/object/unix.html; homepage = http://www.nvidia.com/object/unix.html;

7
pkgs/os-specific/linux/nvidia-x11/legacy96.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}: {stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib}:
let let
@ -32,10 +32,7 @@ stdenv.mkDerivation {
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
programPath = stdenv.lib.makeLibraryPath [ programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib xlibs.libXv ];
gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib
xlibs.libXv
];
meta = { meta = {
homepage = http://www.nvidia.com/object/unix.html; homepage = http://www.nvidia.com/object/unix.html;

4
pkgs/tools/X11/bumblebee/default.nix
View file

@ -28,7 +28,7 @@
# package, and parameterize the two wrappers as well) # package, and parameterize the two wrappers as well)
{ stdenv, fetchurl, pkgconfig, help2man { stdenv, fetchurl, pkgconfig, help2man
, libX11, glibc, gtkLibs, libbsd , libX11, glibc, glib, libbsd
, makeWrapper, buildEnv, module_init_tools , makeWrapper, buildEnv, module_init_tools
, linuxPackages, virtualgl, xorg, xkeyboard_config , linuxPackages, virtualgl, xorg, xkeyboard_config
}: }:
@ -98,7 +98,7 @@ in stdenv.mkDerivation {
# Build-time dependencies of bumblebeed and optirun. # Build-time dependencies of bumblebeed and optirun.
# Note that it has several runtime dependencies. # Note that it has several runtime dependencies.
buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 gtkLibs.glib libbsd ]; buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 glib libbsd ];
# create a wrapper environment for bumblebeed and optirun # create a wrapper environment for bumblebeed and optirun
postInstall = '' postInstall = ''

2
pkgs/tools/admin/gtk-vnc/default.nix
View file

@ -7,7 +7,7 @@ builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
["perlPackages" "firefox36Pkgs" "gtkLibs"]; ["perlPackages" "firefox36Pkgs"];
buildInputs = (map (n: builtins.getAttr n x) buildInputs = (map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames))) (builtins.attrNames (builtins.removeAttrs x helperArgNames)))

8
pkgs/top-level/all-packages.nix
View file

@ -6897,7 +6897,9 @@ let
jwm = callPackage ../applications/window-managers/jwm { }; jwm = callPackage ../applications/window-managers/jwm { };
k3d = callPackage ../applications/graphics/k3d {}; k3d = callPackage ../applications/graphics/k3d {
inherit (pkgs.gnome) gtkglext;
};
keepnote = callPackage ../applications/office/keepnote { keepnote = callPackage ../applications/office/keepnote {
pygtk = pyGtkGlade; pygtk = pyGtkGlade;
@ -8358,7 +8360,9 @@ let
maven2 = callPackage ../misc/maven { }; maven2 = callPackage ../misc/maven { };
maven3 = callPackage ../misc/maven/3.0.nix { }; maven3 = callPackage ../misc/maven/3.0.nix { };
mess = callPackage ../misc/emulators/mess { }; mess = callPackage ../misc/emulators/mess {
inherit (pkgs.gnome) GConf;
};
mupen64plus = callPackage ../misc/emulators/mupen64plus { }; mupen64plus = callPackage ../misc/emulators/mupen64plus { };

4
pkgs/top-level/haskell-packages.nix
View file

@ -751,7 +751,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
GLUT = self.GLUT_2_3_0_0; GLUT = self.GLUT_2_3_0_0;
gtk = callPackage ../development/libraries/haskell/gtk { gtk = callPackage ../development/libraries/haskell/gtk {
inherit (pkgs.gtkLibs) gtk; inherit (pkgs) gtk;
libc = pkgs.stdenv.gcc.libc; libc = pkgs.stdenv.gcc.libc;
}; };
@ -1068,7 +1068,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};
pango = callPackage ../development/libraries/haskell/pango { pango = callPackage ../development/libraries/haskell/pango {
inherit (pkgs.gtkLibs) pango; inherit (pkgs) pango;
libc = pkgs.stdenv.gcc.libc; libc = pkgs.stdenv.gcc.libc;
}; };

2
pkgs/top-level/python-packages.nix
View file

@ -1006,7 +1006,7 @@ let pythonPackages = python.modules // rec {
sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx";
}; };
buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.gtkLibs.glib pkgs.gtkLibs.gtk pkgs.dbus_glib ]; buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ];
postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";