From 736ecb4c5325cfc0b0975122ebd9c432ecf46cfa Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Mar 2012 14:07:27 +0000 Subject: Remove esound and libaudiofile svn path=/nixpkgs/trunk/; revision=32983 --- pkgs/desktops/gnome-2/default.nix | 4 ---- pkgs/desktops/gnome-2/platform/audiofile/default.nix | 12 ------------ pkgs/desktops/gnome-2/platform/esound/default.nix | 13 ------------- 3 files changed, 29 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/platform/audiofile/default.nix delete mode 100644 pkgs/desktops/gnome-2/platform/esound/default.nix (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 334bd5e7fc2c..ac99c24e308f 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -11,10 +11,6 @@ #### PLATFORM - audiofile = callPackage ./platform/audiofile { }; - - esound = callPackage ./platform/esound { }; - libIDL = callPackage ./platform/libIDL { gettext = if stdenv.isDarwin then gettext else null; }; diff --git a/pkgs/desktops/gnome-2/platform/audiofile/default.nix b/pkgs/desktops/gnome-2/platform/audiofile/default.nix deleted file mode 100644 index 74007218347d..000000000000 --- a/pkgs/desktops/gnome-2/platform/audiofile/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, alsaLib}: - -stdenv.mkDerivation { - name = "audiofile-0.3.2"; - - src = fetchurl { - url = mirror://gnome/sources/audiofile/0.3/audiofile-0.3.2.tar.xz; - sha256 = "185j69j6b0vp6h6bb4j4ipvcyysxf63ghxnvdhh8kbc7ixm71hgs"; - }; - - buildInputs = [ alsaLib ]; -} diff --git a/pkgs/desktops/gnome-2/platform/esound/default.nix b/pkgs/desktops/gnome-2/platform/esound/default.nix deleted file mode 100644 index e273251bfa58..000000000000 --- a/pkgs/desktops/gnome-2/platform/esound/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, alsaLib, audiofile}: - -stdenv.mkDerivation { - name = "esound-0.2.41"; - - src = fetchurl { - url = mirror://gnome/sources/esound/0.2/esound-0.2.41.tar.bz2; - sha256 = "04a9ldy7hsvry1xmfhzg5is2dabsp8m6a82vkai64d2blqlxvday"; - }; - - buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ alsaLib audiofile ]; -} -- cgit 1.4.1 From 0a66c08eb92acee7a2608e1fc4e23b6e67d8b602 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Mar 2012 14:07:30 +0000 Subject: kdepim-runtime: drop patch svn path=/nixpkgs/trunk/; revision=32984 --- pkgs/desktops/kde-4.8/kdepim-runtime.nix | 7 ------- 1 file changed, 7 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/kde-4.8/kdepim-runtime.nix b/pkgs/desktops/kde-4.8/kdepim-runtime.nix index f9280aad23ac..ef637f3f075b 100644 --- a/pkgs/desktops/kde-4.8/kdepim-runtime.nix +++ b/pkgs/desktops/kde-4.8/kdepim-runtime.nix @@ -5,13 +5,6 @@ kde { buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2 libxslt ]; - patches = map fetchurl [ { - # See https://bugs.kde.org/show_bug.cgi?id=289932 - url = "http://bugsfiles.kde.org/attachment.cgi?id=68763"; - name = "delays-in-nepomuk-indexing.patch"; - sha256 = "0j3ndqwvi4bg789jb0wqsh2zpwi1gwdyng9gdmng189dx409jf85"; - } ]; - meta = { description = "KDE PIM runtime"; license = "GPL"; -- cgit 1.4.1 From 39ceaa7aff8bfee44bf8c597de24f92e781d6f4e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Mar 2012 14:35:19 +0000 Subject: kde-runtime: apply patch that (hopefully) fixes virtuoso-t eating 100% CPU svn path=/nixpkgs/trunk/; revision=32988 --- pkgs/desktops/kde-4.8/kde-runtime.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix index 9b25e77b0835..6f2e4cf0e65e 100644 --- a/pkgs/desktops/kde-4.8/kde-runtime.nix +++ b/pkgs/desktops/kde-4.8/kde-runtime.nix @@ -1,5 +1,5 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica -, libcanberra, virtuoso, samba, ntrack, libjpeg +, libcanberra, virtuoso, samba, ntrack, libjpeg, fetchurl }: kde { @@ -10,6 +10,13 @@ kde { passthru.propagatedUserEnvPackages = [ virtuoso ]; + patches = map fetchurl [{ + # See https://bugs.kde.org/show_bug.cgi?id=289932 + url = "http://bugsfiles.kde.org/attachment.cgi?id=69386"; + name = "resourceidentifier.patch"; + sha256 = "1fpjg1yc191i6ga9sz6r530q9zwh790m3qahsp0i6kzajwpi7jwz"; + }]; + meta = { license = "LGPL"; }; -- cgit 1.4.1 From c719876055923910ebc42e948bcdf53bca1da839 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Mar 2012 14:52:03 +0000 Subject: Remove unused files svn path=/nixpkgs/trunk/; revision=32991 --- pkgs/desktops/kde-4.8/kdebindings/smokekde.nix | 10 --------- pkgs/desktops/kde-4.8/kipi-plugins.nix | 29 -------------------------- 2 files changed, 39 deletions(-) delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/smokekde.nix delete mode 100644 pkgs/desktops/kde-4.8/kipi-plugins.nix (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix deleted file mode 100644 index c49a77a48ed6..000000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, smokeqt }: - -kde { - propagatedBuildInputs = [ kdelibs smokeqt ]; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kipi-plugins.nix b/pkgs/desktops/kde-4.8/kipi-plugins.nix deleted file mode 100644 index ea237a5d718e..000000000000 --- a/pkgs/desktops/kde-4.8/kipi-plugins.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, cmake, kdelibs, qt4, automoc4, phonon, libkexiv2 -, libkdcraw, libkipi, gettext, libxml2, libxslt, qjson, qca2 -, kdepimlibs }: - -stdenv.mkDerivation rec { - name = "kipi-plugins-1.9.0"; - - src = fetchurl { - url = "mirror://sourceforge/kipi/${name}.tar.bz2"; - sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m"; - }; - - buildInputs = - # Some dependencies are missing because they are very big (OpenCV, - # GTK). - [ cmake kdelibs qt4 automoc4 phonon libkexiv2 libkdcraw libkipi - gettext libxml2 libxslt qjson qca2 kdepimlibs - ]; - - enableParallelBuilding = true; - - meta = { - description = "Photo Management Program"; - license = "GPL"; - homepage = http://www.kipi-plugins.org; - inherit (kdelibs.meta) platforms; - maintainers = with stdenv.lib.maintainers; [ viric urkud ]; - }; -} -- cgit 1.4.1 From 68fe867e195626ede48975ea6d65a239392b4ca2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Mar 2012 21:57:32 +0000 Subject: Get rid of most references to gtkLibs svn path=/nixpkgs/trunk/; revision=33088 --- pkgs/applications/graphics/gimp/plugins/default.nix | 3 +-- pkgs/applications/graphics/k3d/default.nix | 14 +++++++------- pkgs/applications/misc/adobe-reader/default.nix | 11 +++-------- pkgs/applications/networking/browsers/chromium/default.nix | 5 +++-- .../mozilla-plugins/google-talk-plugin/default.nix | 6 +++--- pkgs/applications/networking/dropbox/default.nix | 9 +++++---- .../networking/instant-messengers/oneteam/default.nix | 6 +++--- pkgs/desktops/xfce-4.6/default.nix | 2 +- pkgs/desktops/xfce-4.8/default.nix | 2 +- pkgs/misc/emulators/gens-gs/default.nix | 4 ++-- pkgs/misc/emulators/mess/default.nix | 4 ++-- pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 ++-- pkgs/os-specific/linux/nvidia-x11/default.nix | 5 +++-- pkgs/os-specific/linux/nvidia-x11/legacy173.nix | 7 ++----- pkgs/os-specific/linux/nvidia-x11/legacy96.nix | 7 ++----- pkgs/tools/X11/bumblebee/default.nix | 4 ++-- pkgs/tools/admin/gtk-vnc/default.nix | 2 +- pkgs/top-level/all-packages.nix | 8 ++++++-- pkgs/top-level/haskell-packages.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 20 files changed, 52 insertions(+), 57 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index b80d27bfcf9b..70a27030969b 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -5,8 +5,7 @@ { pkgs, gimp }: let - inherit (pkgs) stdenv fetchurl pkgconfig gtkLibs; - inherit (gtkLibs) glib; + inherit (pkgs) stdenv fetchurl pkgconfig glib; targetPluginDir = "$out/${gimp.name}-plugins"; targetScriptDir = "$out/${gimp.name}-scripts"; prefix = "plugin-gimp-"; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index c1579579d813..db6288f4cf11 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, gtkLibs, gnome - , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype - , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff - , gettext, intltool, perl - }: +{stdenv, fetchurl +, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff +, gettext, intltool, perl, gtkmm, glibmm, gtkglext +}: stdenv.mkDerivation rec { version = "0.8.0.2"; name = "k3d-${version}"; 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"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { 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 boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 25bce4203eed..6eaf976faa46 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -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"; @@ -17,13 +18,7 @@ stdenv.mkDerivation { # versions. libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc libX11 zlib libxml2 cups - gtkLibs.pango - gtkLibs.atk - gtkLibs.gtk - gtkLibs.glib - gtkLibs.gdk_pixbuf - ]; + [ stdenv.gcc.gcc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ]; meta = { description = "Adobe Reader, a viewer for PDF documents"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3fffc68b6b2e..a73f87b4a533 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,6 @@ { 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 , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf , stdenv, unzip, zlib, pam, pcre }: @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc - gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango + glib gtk gdk_pixbuf pango pam ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index eae84d9c3a6d..821ddbd3dad8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -21,9 +21,9 @@ let ]; rpath32 = makeLibraryPath - [ pkgsi686Linux.gtkLibs.gdk_pixbuf - pkgsi686Linux.gtkLibs.glib - pkgsi686Linux.gtkLibs.gtk + [ pkgsi686Linux.gdk_pixbuf + pkgsi686Linux.glib + pkgsi686Linux.gtk pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libXcomposite pkgsi686Linux.xorg.libXfixes diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 936fedd1491e..f8d97a4f167c 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, makeDesktopItem -, xlibs, gtkLibs, gnome +, libSM, libX11, libXext, libXcomposite, libXcursor, libXdamage +, libXfixes, libXi, libXinerama, libXrandr, libXrender , dbus, dbus_glib, fontconfig, gcc, patchelf +, atk, glib, gdk_pixbuf, gtk, pango }: # this package contains the daemon version of dropbox @@ -28,8 +30,7 @@ let # Libraries referenced by dropbox binary. # Be aware that future versions of the dropbox binary may refer # to different versions than are currently in these packages. - ldpath = with xlibs; with gtkLibs; with gnome; - stdenv.lib.makeSearchPath "lib" [ + ldpath = stdenv.lib.makeSearchPath "lib" [ libSM libX11 libXext libXcomposite libXcursor libXdamage libXfixes libXi libXinerama libXrandr libXrender atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf @@ -83,4 +84,4 @@ in stdenv.mkDerivation { description = "Online stored folders (daemon version)"; homepage = http://www.dropbox.com; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 026ab3fff1c5..3549d7f14996 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -1,16 +1,16 @@ x@{builderDefsPackage , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig - , pulseaudio, gtkLibs, pixman, nspr, nss, libXScrnSaver, scrnsaverproto + , pulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto , ...}: builderDefsPackage (a : let helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["fetchgit" "perlPackages" "gtkLibs"]; + ["fetchgit" "perlPackages"]; buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)) ++ [ - a.perlPackages.SubName a.gtkLibs.gtk a.gtkLibs.glib + a.perlPackages.SubName a.gtk a.glib ]; sourceInfo = rec { baseName="oneteam"; diff --git a/pkgs/desktops/xfce-4.6/default.nix b/pkgs/desktops/xfce-4.6/default.nix index 6f2eaf1b4bfe..1769c3f7a041 100644 --- a/pkgs/desktops/xfce-4.6/default.nix +++ b/pkgs/desktops/xfce-4.6/default.nix @@ -1,7 +1,7 @@ { callPackage, pkgs }: rec { - inherit (pkgs.gtkLibs) gtk glib; + inherit (pkgs) gtk glib; #### CORE diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index 971071c3accb..8e6f7c10234c 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -1,7 +1,7 @@ { callPackage, pkgs }: rec { - inherit (pkgs.gtkLibs) gtk glib; + inherit (pkgs) gtk glib; #### SUPPORT diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index a6f457b52109..217468c5bd2a 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkLibs, SDL, nasm, zlib, libpng, mesa }: +{ stdenv, fetchurl, pkgconfig, gtk, SDL, nasm, zlib, libpng, mesa }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { 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+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index 150042ad7963..990f1e7106e1 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtkLibs, gnome, mesa +{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk, GConf, mesa , expat, zlib }: let @@ -32,7 +32,7 @@ stdenv.mkDerivation { makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1"; buildInputs = - [ unzip pkgconfig SDL gtkLibs.gtk gnome.GConf mesa expat zlib ]; + [ unzip pkgconfig SDL gtk GConf mesa expat zlib ]; installPhase = '' diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index c6aa7baea2fe..9910768b5470 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - cmake, dbus_glib, glib, gtk, gtkLibs, pkgconfig, xorg }: + cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { version = "1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { 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 xorg.libxcb xorg.pixman ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 23d1062cc398..0243dcb88d41 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -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 # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -38,7 +39,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; 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 ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 541e442f6b17..4b30137f5b64 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}: +{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib}: let @@ -32,10 +32,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; - programPath = stdenv.lib.makeLibraryPath [ - gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib - xlibs.libXv - ]; + programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib xlibs.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix index a7ba4d5ca956..156484f53e1f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}: +{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib}: let @@ -32,10 +32,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; - programPath = stdenv.lib.makeLibraryPath [ - gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib - xlibs.libXv - ]; + programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib xlibs.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 2e0c700641f7..74e3e7b1f82d 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -28,7 +28,7 @@ # package, and parameterize the two wrappers as well) { stdenv, fetchurl, pkgconfig, help2man -, libX11, glibc, gtkLibs, libbsd +, libX11, glibc, glib, libbsd , makeWrapper, buildEnv, module_init_tools , linuxPackages, virtualgl, xorg, xkeyboard_config }: @@ -98,7 +98,7 @@ in stdenv.mkDerivation { # Build-time dependencies of bumblebeed and optirun. # 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 postInstall = '' diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 036389babe23..1fda870d5fbb 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -7,7 +7,7 @@ builderDefsPackage (a : let helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["perlPackages" "firefox36Pkgs" "gtkLibs"]; + ["perlPackages" "firefox36Pkgs"]; buildInputs = (map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames))) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cdae5c5bc96..bce46f6e2f3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6897,7 +6897,9 @@ let 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 { pygtk = pyGtkGlade; @@ -8358,7 +8360,9 @@ let maven2 = callPackage ../misc/maven { }; 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 { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b9723724f7ac..148ee5c39849 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -751,7 +751,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_3_0_0; gtk = callPackage ../development/libraries/haskell/gtk { - inherit (pkgs.gtkLibs) gtk; + inherit (pkgs) gtk; 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 {}; pango = callPackage ../development/libraries/haskell/pango { - inherit (pkgs.gtkLibs) pango; + inherit (pkgs) pango; libc = pkgs.stdenv.gcc.libc; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e8b8b9f8ac2..7d1b828a608b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1006,7 +1006,7 @@ let pythonPackages = python.modules // rec { 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 ."; -- cgit 1.4.1 From fe1115caf48a467349127723a0e60b106433a076 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Mar 2012 22:44:52 +0000 Subject: Make nixpkgs ready for gst_all attrset removal svn path=/nixpkgs/trunk/; revision=33092 --- pkgs/applications/audio/GStreamer/default.nix | 13 ------ pkgs/applications/misc/xneur/0.8.nix | 4 +- pkgs/applications/misc/xneur/default.nix | 4 +- .../networking/browsers/opera/default.nix | 4 +- .../networking/browsers/uzbl/default.nix | 6 +-- .../instant-messengers/carrier/2.4.2.nix | 2 +- .../instant-messengers/carrier/2.5.0.nix | 2 +- .../instant-messengers/pidgin/default.nix | 4 +- .../networking/instant-messengers/psi/default.nix | 6 +-- .../networking/instant-messengers/psi/psimedia.nix | 5 ++- .../applications/office/openoffice/libreoffice.nix | 4 +- pkgs/applications/video/gnash/default.nix | 16 ++++---- .../desktops/xfce-4.6/applications/xfce4-mixer.nix | 10 ++--- .../desktops/xfce-4.8/applications/xfce4-mixer.nix | 10 ++--- pkgs/development/libraries/farsight2/default.nix | 4 +- pkgs/development/libraries/libnice/default.nix | 4 +- .../libraries/phonon-backend-gstreamer/default.nix | 7 ++-- pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 +- .../libraries/telepathy/farsight/default.nix | 4 +- pkgs/development/libraries/webkit/default.nix | 4 +- pkgs/development/libraries/webkit/svn.nix | 4 +- pkgs/development/libraries/wxGTK-2.8/default.nix | 4 +- pkgs/development/libraries/wxGTK-2.9/2.9.0.nix | 4 +- pkgs/development/libraries/wxGTK-2.9/2.9.1.nix | 4 +- pkgs/os-specific/linux/bluez/default.nix | 4 +- pkgs/top-level/all-packages.nix | 47 +++++----------------- 26 files changed, 73 insertions(+), 111 deletions(-) delete mode 100644 pkgs/applications/audio/GStreamer/default.nix (limited to 'pkgs/desktops') diff --git a/pkgs/applications/audio/GStreamer/default.nix b/pkgs/applications/audio/GStreamer/default.nix deleted file mode 100644 index 0239b29f7ee2..000000000000 --- a/pkgs/applications/audio/GStreamer/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, perl -, bison, flex, glib -, pkgconfig, libxml2}: - -stdenv.mkDerivation { - name = "GStreamer-0.10.10"; - src = fetchurl { - url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2; - md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc"; - }; - - buildInputs = [perl bison flex glib pkgconfig libxml2]; -} diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix index f94aa0c2fbc7..3eb84e6d4eae 100644 --- a/pkgs/applications/misc/xneur/0.8.nix +++ b/pkgs/applications/misc/xneur/0.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcre, GStreamer, glib, libxml2, aspell +{ stdenv, fetchurl, pkgconfig, pcre, gstreamer, glib, libxml2, aspell , imlib2, xorg, xosd }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = - [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell + [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext ]; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index bdaaaa43c74a..4f6e3342f588 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2 +{ stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2 , aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant, gdk_pixbuf}: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo + [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify gtk pango enchant gdk_pixbuf ]; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 19a55c0f89cd..b6c9789bcfe6 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, cups, xz -, gstreamer, gstPluginsBase, libxml2 +, gstreamer, gst_plugins_base, libxml2 , gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk , kdeSupport ? false, qt4, kdelibs }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE libXft freetype fontconfig libXrender libuuid expat - gstreamer libxml2 gstPluginsBase + gstreamer libxml2 gst_plugins_base ] ++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ] ++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ]; diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 145e5de90b72..b21d1862de5d 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -26,9 +26,9 @@ rec { doWrap = a.makeManyWrappers "$out/bin/uzbl-core" '' --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \ - --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \ - --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsGood}/lib/gstreamer-* \ - --prefix GST_PLUGIN_PATH : ${a.webkit.gstFfmpeg}/lib/gstreamer-* \ + --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_base}/lib/gstreamer-* \ + --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_good}/lib/gstreamer-* \ + --prefix GST_PLUGIN_PATH : ${a.webkit.gst_ffmpeg}/lib/gstreamer-* \ --prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules ''; diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix index 6a86774226d3..877e71d0d00e 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix @@ -14,7 +14,7 @@ rec { }; buildInputs = [gtkspell aspell - GStreamer startupnotification + gstreamer startupnotification libxml2 openssl nss libXScrnSaver ncurses scrnsaverproto libX11 xproto kbproto GConf avahi diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index 58f65a2709ec..8bb28f7ce000 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -14,7 +14,7 @@ rec { }; buildInputs = [gtkspell aspell - GStreamer startupnotification + gstreamer startupnotification libxml2 openssl nss libXScrnSaver ncurses scrnsaverproto libX11 xproto kbproto GConf avahi diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 637744fc1821..aad1996f023b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -11,7 +11,7 @@ * - doxygen */ { stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell, - GStreamer, gstPluginsBase, startupnotification, gettext, + gstreamer, gst_plugins_base, startupnotification, gettext, perl, perlXMLParser, libxml2, nss, nspr, farsight2, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn , lib, python @@ -30,7 +30,7 @@ stdenv.mkDerivation { inherit nss ncurses; buildInputs = [ gtkspell aspell - GStreamer gstPluginsBase startupnotification + gstreamer gst_plugins_base startupnotification libxml2] ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 66dbddece3cc..2c6ba36c44f1 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, - libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all, which, glib }: + libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }: stdenv.mkDerivation rec { name = "psi-0.14"; @@ -21,9 +21,7 @@ stdenv.mkDerivation rec { " --disable-bundled-qca" ]; - psiMedia = (import ./psimedia.nix) { - inherit stdenv fetchurl qt4 speex gst_all liboil which glib pkgconfig; - }; + psiMedia = callPackage ./psimedia.nix { }; postInstall = '' PSI_PLUGINS="$out/lib/psi/plugins" diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix index c7cee2f2c665..df821da42f20 100644 --- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix +++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, qt4, gst_all, liboil, speex, which, glib, pkgconfig}: +{stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which +, glib, pkgconfig}: stdenv.mkDerivation rec { name = "psimedia"; @@ -8,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781"; }; - buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex which glib pkgconfig]; + buildInputs = [qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig]; configurePhase = ''./configure''; diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index 5d4bd01e6cf9..49ae1f401ab1 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -4,7 +4,7 @@ , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler -, librsvg, gnome_vfs, gstreamer, gstPluginsBase, mesa +, librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash , fontsConf , langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa - cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gstPluginsBase + cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gst_plugins_base ant autoconf openldap cppunit poppler librsvg automake ]; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 5e6d1d8f942a..f8415bbe22a4 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl -, SDL, SDL_mixer, gstreamer, gstPluginsBase, gstPluginsGood -, gstFfmpeg, speex +, SDL, SDL_mixer, gstreamer, gst_plugins_base, gst_plugins_good +, gst_ffmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext , glib, gtk, gtkglext, x11, ming, dejagnu, python, perl @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { # XXX: KDE is supported as well so we could make it available optionally. buildInputs = [ - gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstPluginsGood - gstFfmpeg speex libtool + gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good + gst_ffmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg dbus curl pkgconfig glib gtk gtkglext xulrunner @@ -63,10 +63,10 @@ stdenv.mkDerivation rec { --enable-media=gst \ --enable-gui=gtk" - # In `libmedia', Gnash compiles with "-I$gstPluginsBase/include", - # whereas it really needs "-I$gstPluginsBase/include/gstreamer-0.10". + # In `libmedia', Gnash compiles with "-I$gst_plugins_base/include", + # whereas it really needs "-I$gst_plugins_base/include/gstreamer-0.10". # Work around this using GCC's $CPATH variable. - export CPATH="${gstPluginsBase}/include/gstreamer-0.10:${gstPluginsGood}/include/gstreamer-0.10" + export CPATH="${gst_plugins_base}/include/gstreamer-0.10:${gst_plugins_good}/include/gstreamer-0.10" echo "\$CPATH set to \`$CPATH'" echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'" @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { do wrapProgram "$prog" --prefix \ GST_PLUGIN_PATH ":" \ - "${gstPluginsBase}/lib/gstreamer-0.10:${gstPluginsGood}/lib/gstreamer-0.10:${gstFfmpeg}/lib/gstreamer-0.10" + "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_ffmpeg}/lib/gstreamer-0.10" done ''; diff --git a/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix index db28274be072..76cc5ea028f0 100644 --- a/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk -, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base +, gtk, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }: let # The usual Gstreamer plugins package has a zillion dependencies # that we don't need for a simple mixer, so build a minimal package. - gstPluginsBase = gst_all.gstPluginsBase.override { + gst_plugins_minimal = gst_plugins_base.override { minimalDeps = true; }; @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk + [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk libxfce4util libxfcegui4 xfce4panel xfconf makeWrapper ]; postInstall = '' mkdir -p $out/nix-support - echo ${gstPluginsBase} > $out/nix-support/propagated-user-env-packages + echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages ''; meta = { diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix index bb50a0610f60..2f1ab8a8e93c 100644 --- a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk -, libxfce4util, libxfce4ui, xfce4panel, xfconf }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base +, gtk, libxfce4util, libxfce4ui, xfce4panel, xfconf }: let # The usual Gstreamer plugins package has a zillion dependencies # that we don't need for a simple mixer, so build a minimal package. - gstPluginsBase = gst_all.gstPluginsBase.override { + gst_plugins_minimal = gst_plugins_base.override { minimalDeps = true; }; @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk + [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk libxfce4util libxfce4ui xfce4panel xfconf ]; postInstall = '' mkdir -p $out/nix-support - echo ${gstPluginsBase} > $out/nix-support/propagated-user-env-packages + echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages ''; meta = { diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix index 15615a2bd5dc..cbb21073685c 100644 --- a/pkgs/development/libraries/farsight2/default.nix +++ b/pkgs/development/libraries/farsight2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gstPluginsBase +{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base , pygobject, gst_python, gupnp_igd }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ pkgconfig ]; - propagatedBuildInputs = [ gstreamer gstPluginsBase ]; + propagatedBuildInputs = [ gstreamer gst_plugins_base ]; meta = { homepage = http://farsight.freedesktop.org/wiki/; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 10ce660e1ee5..5a3cb9d041b5 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gstPluginsBase }: +{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gst_plugins_base }: stdenv.mkDerivation rec { name = "libnice-0.1.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0jcpb953jn7c3ng2vbkljybzh63x6mg4m6rjxj1s1iccm3fi6qki"; }; - buildInputs = [ pkgconfig glib gupnp_igd gstreamer gstPluginsBase ]; + buildInputs = [ pkgconfig glib gupnp_igd gstreamer gst_plugins_base ]; meta = { homepage = http://nice.freedesktop.org/wiki/; diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index d4fb593ca80c..b2677eb1e7a5 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all, xz }: +{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gstreamer +, gst_plugins_base }: let version = "4.6.0"; @@ -13,9 +14,9 @@ stdenv.mkDerivation rec { sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v"; }; - buildInputs = [ phonon qt4 gst_all.gstreamer gst_all.gstPluginsBase ]; + buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; - buildNativeInputs = [ cmake automoc4 xz pkgconfig ]; + buildNativeInputs = [ cmake automoc4 pkgconfig ]; meta = { homepage = http://phonon.kde.org/; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index dfaf63e67257..2c5a7814bc18 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll -, alsaLib, gstreamer, gstPluginsBase +, alsaLib, gstreamer, gst_plugins_base , libXrender, libXinerama, libXcursor, libXmu , libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig , zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM mesa alsaLib zlib libpng openssl dbus.libs freetype fontconfig glib - gstreamer gstPluginsBase + gstreamer gst_plugins_base ]; # The following libraries are only used in plugins diff --git a/pkgs/development/libraries/telepathy/farsight/default.nix b/pkgs/development/libraries/telepathy/farsight/default.nix index ebd9db1c5d4e..0f5b8b5d82c7 100644 --- a/pkgs/development/libraries/telepathy/farsight/default.nix +++ b/pkgs/development/libraries/telepathy/farsight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, telepathy_glib, farsight2, gstPluginsBase, dbus_glib +{ stdenv, fetchurl, telepathy_glib, farsight2, gst_plugins_base, dbus_glib , pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0sajy2w109zc6assqby3cfqr7cckwhfsngkhjczz67grb6rbi29c"; }; - buildInputs = [ gstPluginsBase gst_python pygobject ]; + buildInputs = [ gst_plugins_base gst_python pygobject ]; propagatedBuildInputs = [ dbus_glib farsight2 telepathy_glib gstreamer ]; buildNativeInputs = [ pkgconfig python libxslt]; diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index 2daa1796318f..7ad894215df3 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -17,7 +17,7 @@ rec { ]; propagatedBuildInputs = [ - gstreamer gstPluginsBase gstFfmpeg gstPluginsGood + gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good ]; configureFlags = [ @@ -85,6 +85,6 @@ rec { maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gstPluginsBase gstPluginsGood gstFfmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; }; } diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix index d41d4683d6e9..db6fe1ba55c8 100644 --- a/pkgs/development/libraries/webkit/svn.nix +++ b/pkgs/development/libraries/webkit/svn.nix @@ -17,7 +17,7 @@ rec { ]; propagatedBuildInputs = [ - gstreamer gstPluginsBase gstFfmpeg gstPluginsGood + gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good ]; configureCommand = "./autogen.sh "; @@ -86,6 +86,6 @@ rec { maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gstPluginsBase gstPluginsGood gstFfmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; }; } diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 1e3bbe19cd4e..43bcfea4f2e3 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gstPluginsBase, GConf +, gstreamer, gst_plugins_base, GConf , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ] + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix index b5419d6a3875..619806fb7b27 100644 --- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix +++ b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gstPluginsBase, GConf +, gstreamer, gst_plugins_base, GConf , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ] + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix index 30bd79d3eddc..d59ab4880c33 100644 --- a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix +++ b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gstPluginsBase, GConf +, gstreamer, gst_plugins_base, GConf , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ] + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 731a52fb1e58..101879861117 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper -, pythonDBus, pygobject, gst_all, readline, libsndfile }: +, pythonDBus, pygobject, readline, libsndfile }: assert stdenv.isLinux; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { readline libsndfile # Disables GStreamer; not clear what it gains us other than a # zillion extra dependencies. - # gst_all.gstreamer gst_all.gstPluginsBase + # gstreamer gst_plugins_base ]; configureFlags = "--localstatedir=/var --enable-cups"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c00d23e671f9..26298c736ef6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3404,9 +3404,7 @@ let faad2 = callPackage ../development/libraries/faad2 { }; - farsight2 = callPackage ../development/libraries/farsight2 { - inherit (gst_all) gstreamer gstPluginsBase gst_python; - }; + farsight2 = callPackage ../development/libraries/farsight2 { }; fcgi = callPackage ../development/libraries/fcgi { }; @@ -3894,9 +3892,7 @@ let libcaca = callPackage ../development/libraries/libcaca { }; - libcanberra = callPackage ../development/libraries/libcanberra { - # gstreamer = gst_all.gstreamer; - }; + libcanberra = callPackage ../development/libraries/libcanberra { }; libcdaudio = callPackage ../development/libraries/libcdaudio { }; @@ -4036,9 +4032,7 @@ let libnatspec = callPackage ../development/libraries/libnatspec { }; - libnice = callPackage ../development/libraries/libnice { - inherit (gst_all) gstreamer gstPluginsBase; - }; + libnice = callPackage ../development/libraries/libnice { }; libplist = callPackage ../development/libraries/libplist { }; @@ -4426,13 +4420,11 @@ let opencv = callPackage ../development/libraries/opencv { ffmpeg = ffmpeg_0_6_90; - inherit (gst_all) gstreamer; }; opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix { ffmpeg = ffmpeg_0_6_90; libpng = libpng12; - inherit (gst_all) gstreamer; }; # this ctl version is needed by openexr_viewers @@ -4543,8 +4535,6 @@ let qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; - # GStreamer is required for HTML5 video in QtWebKit - inherit (pkgs.gst_all) gstreamer gstPluginsBase; }; qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; @@ -4681,9 +4671,7 @@ let telepathy_glib = callPackage ../development/libraries/telepathy/glib { }; - telepathy_farsight = callPackage ../development/libraries/telepathy/farsight { - inherit (pkgs.gst_all) gstPluginsBase gstreamer gst_python; - }; + telepathy_farsight = callPackage ../development/libraries/telepathy/farsight { }; telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; @@ -4736,8 +4724,8 @@ let icu cairo perl intltool automake libtool pkgconfig autoconf bison libproxy enchant python ruby which flex geoclue; - inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg - gstPluginsGood; + inherit gstreamer gst_plugins_base gst_ffmpeg + gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; libpng = libpng12; }; @@ -4751,8 +4739,8 @@ let icu cairo perl intltool automake libtool pkgconfig autoconf bison libproxy enchant python ruby which flex geoclue; - inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg - gstPluginsGood; + inherit gstreamer gst_plugins_base gst_ffmpeg + gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; libpng = libpng12; }; @@ -4762,19 +4750,16 @@ let wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { - inherit (gst_all) gstreamer gstPluginsBase; inherit (gnome) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix { - inherit (gst_all) gstreamer gstPluginsBase; inherit (gnome) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix { - inherit (gst_all) gstreamer gstPluginsBase; inherit (gnome) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; @@ -6315,8 +6300,7 @@ let carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python - libtool automake autoconf; - GStreamer = gst_all.gstreamer; + libtool automake autoconf gstreamer; inherit gtk glib; inherit (gnome) startupnotification GConf ; inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto kbproto; @@ -6724,7 +6708,6 @@ let gnash = callPackage ../applications/video/gnash { xulrunner = icecatXulrunner3; inherit (gnome) gtkglext; - inherit (gst_all) gstreamer gstPluginsBase gstPluginsGood gstFfmpeg; }; gnome_mplayer = callPackage ../applications/video/gnome-mplayer { @@ -6926,7 +6909,6 @@ let libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; - inherit (gst_all) gstreamer gstPluginsBase; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc xorg.fontbhttf @@ -7129,7 +7111,6 @@ let opera = callPackage ../applications/networking/browsers/opera { inherit (pkgs.kde4) kdelibs; - inherit (pkgs.gst_all) gstreamer gstPluginsBase; }; pan = callPackage ../applications/networking/newsreaders/pan { @@ -7150,9 +7131,7 @@ let openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null; gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null; libgcrypt = if (getConfig ["pidgin" "gnutls"] false) then libgcrypt else null; - GStreamer = gst_all.gstreamer; inherit (gnome) startupnotification; - inherit (gst_all) gstPluginsBase; }; pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { @@ -7560,13 +7539,9 @@ let xineUI = callPackage ../applications/video/xine-ui { }; - xneur = callPackage ../applications/misc/xneur { - GStreamer=gst_all.gstreamer; - }; + xneur = callPackage ../applications/misc/xneur { }; - xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { - GStreamer = gst_all.gstreamer; - }; + xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { }; xournal = callPackage ../applications/graphics/xournal { inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas; -- cgit 1.4.1