treewide: explicitly specify gtk and related package versions

This commit is contained in:
Kirill Boltaev 2016-09-12 00:24:51 +03:00
parent 30107249b1
commit bccd75094f
339 changed files with 893 additions and 872 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cairo, fftw, gtk, gtkmm, lv2, lvtk, pkgconfig, python }:
{ stdenv, fetchurl, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }:
stdenv.mkDerivation rec {
name = "ams-lv2-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5";
};
buildInputs = [ cairo fftw gtk gtkmm lv2 lvtk pkgconfig python ];
buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ];
configurePhase = "python waf configure --prefix=$out";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2
, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo
glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2
makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2
, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo
glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2
makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk2, glib, zlib, perl, intltool,
libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch,
expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
}:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig gettext wxGTK30 expat alsaLib
libsndfile soxr libid3tag gtk
libsndfile soxr libid3tag gtk2
ffmpeg libmad lame libvorbis flac soundtouch
]; #ToDo: detach sbsms

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool
, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
, gtk2, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
stdenv.mkDerivation rec {
name = "beast-0.7.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ zlib guile libart_lgpl pkgconfig intltool gtk glib
[ zlib guile libart_lgpl pkgconfig intltool gtk2 glib
libogg libvorbis libgnomecanvas gettext
];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf
, glib, gtk, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp
, glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp
, libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb
, libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm
, xdg_utils, zenity, zlib }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
libPath = lib.makeLibraryPath [
alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk harfbuzz
alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz
libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender
libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm
zlib

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
, gtk, libjack2, ladspaH , libglade, lv2, pkgconfig }:
, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "calf-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
cairo expat fftwSinglePrec fluidsynth glib gtk libjack2 ladspaH
cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH
libglade lv2 pkgconfig
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }:
{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }:
stdenv.mkDerivation rec {
name = "eq10q-${version}";
version = "2.0";
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "08vlfly0qqrfqiwpn5g5php680icpk97pwnwjadmj5syhgvi0i3h";
};
buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
installFlags = ''
DESTDIR=$(out)

View file

@ -6,7 +6,7 @@
, freetype
, gdk_pixbuf
, glib
, gtk
, gtk2
, pango
}:
@ -22,7 +22,7 @@ faust.wrapWithBuildEnv {
freetype
gdk_pixbuf
glib
gtk
gtk2
pango
];

View file

@ -1,5 +1,5 @@
{ faust
, gtk
, gtk2
, jack2Full
, opencv
}:
@ -15,7 +15,7 @@ faust.wrapWithBuildEnv {
];
propagatedBuildInputs = [
gtk
gtk2
jack2Full
opencv
];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45
, docbook_xsl, gtkmm, intltool, libgig, libsndfile, libtool, libxslt
, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt
, pkgconfig }:
stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
preConfigure = "make -f Makefile.cvs";
buildInputs = [
autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm intltool
autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool
libgig libsndfile libtool libxslt pkgconfig
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk, gsl
{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl
, libaudclient }:
stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mpd_clientlib dbus_glib audacious gtk gsl libaudclient ];
buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ];
hardeningDisable = [ "format" ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib
, gtk, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique
, gtk2, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique
, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook
}:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup
libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme
wrapGAppsHook
];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, gettext, intltool, pkgconfig, python
, avahi, bluez, boost, eigen, fftw, glib, glib_networking
, glibmm, gsettings_desktop_schemas, gtk, gtkmm, libjack2
, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
, ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
, webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler
, optimizationSupport ? false # Enable support for native CPU extensions
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [
avahi bluez boost eigen fftw glib glibmm glib_networking.out
gsettings_desktop_schemas gtk gtkmm libjack2 ladspaH librdf
gsettings_desktop_schemas gtkmm2 libjack2 ladspaH librdf
libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver
zita-resampler
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, libjack2, lilv-svn
{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv-svn
, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom
, suil
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
boost ganv glibmm gtk gtkmm libjack2 lilv-svn lv2 makeWrapper pkgconfig
boost ganv glibmm gtkmm2 libjack2 lilv-svn lv2 makeWrapper pkgconfig
python raul serd sord-svn sratom suil
];

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk, alsaLib, libxml2, librdf }:
{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, librdf }:
stdenv.mkDerivation rec {
name = "jack-rack-1.4.7";
src = fetchurl {
url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
};
buildInputs = [ pkgconfig libjack2 ladspaH gtk alsaLib libxml2 librdf ];
buildInputs = [ pkgconfig libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk, libjack2, lilv, lv2, pkgconfig, python
{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python
, serd, sord , sratom, suil }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
gtk libjack2 lilv lv2 pkgconfig python serd sord sratom suil
gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil
];
configurePhase = "python waf configure --prefix=$out";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, gtk, libjack2, libuuid, libxml2
{ stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2
, makeWrapper, pkgconfig, readline }:
assert libuuid != null;
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
patches = [ ./socket.patch ./gcc-47.patch ];
buildInputs = [ alsaLib gtk libjack2 libxml2 makeWrapper
buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper
pkgconfig readline ];
propagatedBuildInputs = [ libuuid ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }:
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, alsaLib, libglade }:
stdenv.mkDerivation {
name = "lingot-0.9.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
buildInputs = [ pkgconfig intltool gtk alsaLib libglade ];
buildInputs = [ pkgconfig intltool gtk2 alsaLib libglade ];
configureFlags = "--disable-jack";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk, libjack2, ladspaH
{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk2, libjack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame
, vorbis-tools }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3";
};
buildInputs = [ SDL alsaLib gtk libjack2 ladspaH libsamplerate libsndfile
buildInputs = [ SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile
pkgconfig libpulseaudio makeWrapper ];
configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa";

View file

@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
};
pythonPath = with pythonPackages; [
pygobject gst_python musicbrainzngs
pygobject2 gst_python musicbrainzngs
pycdio pyxdg setuptools
CDDB
];

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, ncurses, pkgconfig, gtk }:
{ fetchurl, stdenv, ncurses, pkgconfig, gtk2 }:
stdenv.mkDerivation rec {
name = "mp3info-0.8.5a";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04";
};
buildInputs = [ ncurses pkgconfig gtk ];
buildInputs = [ ncurses pkgconfig gtk2 ];
hardeningDisable = [ "format" ];

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm
{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm2, libglademm
, dbus_glib, GConf, gconfmm, intltool }:
stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
};
buildInputs = [ libpulseaudio gtkmm libglademm dbus_glib gconfmm ];
buildInputs = [ libpulseaudio gtkmm2 libglademm dbus_glib gconfmm ];
nativeBuildInputs = [ pkgconfig intltool ];

View file

@ -1,5 +1,5 @@
{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm, gtk2
, gtkmm, libjack2, pkgconfig, python2
{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm
, gtkmm2, libjack2, pkgconfig, python2
}:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib boost dbus_glib ganv glibmm gtk2 gtkmm libjack2
alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2
pkgconfig python2
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, cmake, gtk, libjack2, libgnomecanvas
{ stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas
, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
, pkgconfig, openssl }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ alsaLib cmake gtk libjack2 libgnomecanvas libpthreadstubs
[ alsaLib cmake gtk2 libjack2 libgnomecanvas libpthreadstubs
libsamplerate libsndfile libtool libxml2 pkgconfig openssl
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, gtk, pkgconfig }:
{ stdenv, fetchurl, alsaLib, gtk2, pkgconfig }:
stdenv.mkDerivation rec {
name = "praat-${version}";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cp praat $out/bin
'';
buildInputs = [ alsaLib gtk pkgconfig ];
buildInputs = [ alsaLib gtk2 pkgconfig ];
meta = {
description = "Doing phonetics by computer";

View file

@ -1,4 +1,4 @@
{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, libjack2
{ alsaLib, autoconf, automake, dssi, fetchurl, gtk2, libjack2
, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
, libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd
, sord, sratom, stdenv, suil }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ alsaLib autoconf automake dssi gtk libjack2 ladspaH
[ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH
ladspaPlugins liblo libmad libsamplerate libsndfile libtool
libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom
suil

View file

@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null
let
version = "2.6.3";
inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject dbus-python;
inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python;
in buildPythonApplication {
# call the package quodlibet and just quodlibet
name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}";
@ -48,7 +48,7 @@ in buildPythonApplication {
];
propagatedBuildInputs = [
mutagen pygtk pygobject dbus-python gst_python intltool
mutagen pygtk pygobject2 dbus-python gst_python intltool
];
postInstall = stdenv.lib.optionalString withGstPlugins ''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, gtkmm, libjack2, pkgconfig }:
{ stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }:
stdenv.mkDerivation rec {
name = "seq24-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
patches = [ ./mutex_no_nameclash.patch ];
buildInputs = [ alsaLib gtkmm libjack2 ];
buildInputs = [ alsaLib gtkmm2 libjack2 ];
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {

View file

@ -1,6 +1,6 @@
{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }:
, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }:
assert stdenv.system == "x86_64-linux";
@ -22,7 +22,7 @@ let
GConf
gdk_pixbuf
glib
gtk
gtk2
libgcrypt
libpng
nss
@ -83,7 +83,7 @@ stdenv.mkDerivation {
librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
wrapProgram $out/share/spotify/spotify \
--prefix LD_LIBRARY_PATH : "$librarypath" \
--prefix PATH : "${gnome.zenity}/bin"
--prefix PATH : "${gnome2.zenity}/bin"
# Desktop file
mkdir -p "$out/share/applications/"

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, libjack2,
{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2,
ladspaH, ladspaPlugins, liblo, pkgconfig }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
};
buildInputs = [ alsaLib autoconf automake dssi gtk libjack2 ladspaH
buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH
ladspaPlugins liblo pkgconfig ];
installPhase = ''

View file

@ -1,11 +1,11 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk, atk, pango, freetype, fontconfig
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
, gconf, nss, xorg, libcap, systemd, libnotify
}:
let
packages = [
stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, buildEnv, gtk, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
{ stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
, cups, libgcrypt_1_5, systemd, makeWrapper, dbus }:
let
bracketsEnv = buildEnv {
name = "env-brackets";
paths = [
gtk glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5
gtk2 glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5
dbus systemd.lib
];
};

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk2
, contribPlugins ? false, hunspell, gamin, boost
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p";
};
buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ]
buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk2 ]
++ optionals contribPlugins [ hunspell gamin boost ];
enableParallelBuilding = true;
patches = [ ./writable-projects.patch ];

View file

@ -1,4 +1,4 @@
{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }:
{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }:
{ name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
# Create desktop item.

View file

@ -1,16 +1,16 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, freetype, fontconfig, libX11, libXext, libXrender, zlib
, glib, gtk, libXtst, jdk
, glib, libXtst, jdk
, webkitgtk2 ? null # for internal web browser
, buildEnv, writeText, runCommand
, callPackage
} @ args:
}:
assert stdenv ? glibc;
rec {
buildEclipse = import ./build-eclipse.nix args;
buildEclipse = callPackage ./build-eclipse.nix { };
eclipse-sdk-35 = buildEclipse {
name = "eclipse-sdk-3.5.2";

View file

@ -1,8 +1,8 @@
{ runCommand, makeWrapper, geany, gnome }:
{ runCommand, makeWrapper, geany, gnome2 }:
let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name;
in
runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } "
mkdir -p $out
ln -s ${geany}/share $out
makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome.vte}/lib
makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib
"

View file

@ -1,7 +1,7 @@
{ avahiSupport ? false # build support for Avahi in libinfinity
, gnomeSupport ? false # build support for Gnome(gnome-vfs)
, stdenv, fetchurl, pkgconfig
, gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
, gnome_vfs ? null}:
let
@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc";
};
buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ]
buildInputs = [ pkgconfig gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ]
++ stdenv.lib.optional gnomeSupport gnome_vfs;
configureFlags = ''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk }:
{ stdenv, fetchurl, intltool, pkgconfig, gtk2 }:
stdenv.mkDerivation rec {
version = "0.8.18.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
};
buildInputs = [ intltool pkgconfig gtk ];
buildInputs = [ intltool pkgconfig gtk2 ];
hardeningDisable = [ "format" ];

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify
}:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchgit, fetchNuGet
, autoconf, automake, pkgconfig, shared_mime_info, intltool
, glib, mono, gtk-sharp, gnome, gnome-sharp, unzip
, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip
, dotnetPackages
}:
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [
autoconf automake pkgconfig shared_mime_info intltool
mono gtk-sharp gnome-sharp unzip
mono gtk-sharp-2_0 gnome-sharp unzip
pkgconfig
dotnetPackages.NUnit
dotnetPackages.NUnitRunners
@ -57,9 +57,9 @@ stdenv.mkDerivation rec {
for prog in monodevelop mdtool; do
patch -p 0 $out/bin/$prog <<EOF
2a3,5
> export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp}:\$MONO_GAC_PREFIX
> export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX
> export PATH=${mono}/bin:\$PATH
> export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome.libgnomeui gnome.gnome_vfs gnome-sharp gtk-sharp gtk-sharp.gtk ]}:\$LD_LIBRARY_PATH
> export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH
>
EOF
done

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk }:
{ stdenv, fetchurl, pkgconfig, gtk2 }:
let
version = "3.3.7";
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd";
};
buildInputs = [ pkgconfig gtk ];
buildInputs = [ pkgconfig gtk2 ];
sourceRoot = "scintilla/gtk";
buildPhase = ''

View file

@ -1,6 +1,6 @@
{ fetchurl, stdenv, glib, xorg, cairo, gtk, makeDesktopItem }:
{ fetchurl, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }:
let
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo];
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo];
in
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2,
{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2,
pkexecPath ? "/var/setuid-wrappers/pkexec", libredirect,
gksuSupport ? false, gksu}:
@ -7,7 +7,7 @@ assert gksuSupport -> gksu != null;
let
build = "3114";
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango];
redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
in let

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, mono, gtk-sharp, pkgconfig, makeWrapper, gnome, gtk }:
{ stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }:
stdenv.mkDerivation rec {
version = "git-2014-08-20";
name = "supertux-editor-${version}";
@ -10,19 +10,19 @@ stdenv.mkDerivation rec {
sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";
};
buildInputs = [mono gtk-sharp pkgconfig makeWrapper gnome.libglade gtk ];
buildInputs = [mono gtk-sharp-2_0 pkgconfig makeWrapper gnome2.libglade gtk2 ];
installPhase = ''
mkdir -p $out/bin $out/lib/supertux-editor
cp *.{dll,dll.config,exe} $out/lib/supertux-editor
makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor \
--add-flags "$out/lib/supertux-editor/supertux-editor.exe" \
--prefix MONO_GAC_PREFIX : ${gtk-sharp} \
--prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
--suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //')
makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor-debug \
--add-flags "--debug $out/lib/supertux-editor/supertux-editor.exe" \
--prefix MONO_GAC_PREFIX : ${gtk-sharp} \
--prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
--suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //')
'';

View file

@ -1,4 +1,4 @@
{ stdenv, fetchhg, fetchurl, fetchzip, gtk, glib, pkgconfig, unzip, ncurses, zip }:
{ stdenv, fetchhg, fetchurl, fetchzip, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
let
# Textadept requires a whole bunch of external dependencies.
# The build system expects to be able to download them with wget.
@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
name = "textadept-${version}";
buildInputs = [
gtk glib pkgconfig unzip ncurses zip
gtk2 glib pkgconfig unzip ncurses zip
];
src = fetchhg {

View file

@ -1,7 +1,7 @@
# TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
# but I have gvim with python support now :) - Marc
args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgconfig, gettext
, composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby
, composableDerivation, lib, config, glib, gtk2, python, perl, tcl, ruby
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
, libICE
@ -79,7 +79,7 @@ composableDerivation {
= [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];
nativeBuildInputs
= [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau
= [ ncurses pkgconfig gtk2 libX11 libXext libSM libXpm libXt libXaw libXau
libXmu glib libICE ];
# most interpreters aren't tested yet.. (see python for example how to do it)

View file

@ -1,5 +1,5 @@
{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig,
gtkmm, glibmm, libxml2, libsecret, curl, unrar, libzip,
gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip,
librsvg, gst_all_1, autoreconfHook, makeWrapper }:
stdenv.mkDerivation {
name = "ahoviewer-1.4.6";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
};
enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
buildInputs = [ glibmm libconfig gtkmm glibmm libxml2
buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2
libsecret curl unrar libzip librsvg
gst_all_1.gstreamer
gst_all_1.gst-plugins-good

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk, freetype, fontconfig, lcms,
{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms,
flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w";
};
buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg
buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg
libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
{stdenv, fetchurl, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext
, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
, withGNOME ? false, libgnomeui }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ gtk perlXMLParser libxml2 gettext python libxml2Python docbook5
[ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
libxslt docbook_xsl libart_lgpl
] ++ stdenv.lib.optional withGNOME libgnomeui;

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk, perl, perlXMLParser, pkgconfig } :
{stdenv, fetchurl, gtk2, perl, perlXMLParser, pkgconfig } :
let version = "0.4"; in
stdenv.mkDerivation {
@ -20,7 +20,7 @@ stdenv.mkDerivation {
[ ./gcolor2-amd64.patch ] else
[ ];
buildInputs = [ gtk perl perlXMLParser pkgconfig ];
buildInputs = [ gtk2 perl perlXMLParser pkgconfig ];
meta = {
description = "Simple GTK+2 color selector";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2
{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2
, lcms, intltool, gettext, fbida
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-gps" ];
buildInputs = [
pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext
pkgconfig autoconf automake gtk2 libpng exiv2 lcms intltool gettext
];
postInstall = ''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
, python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
[ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo
freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
libmng librsvg libwmf zlib libzip ghostscript aalib jasper
python pygtk libart_lgpl libexif gettext xorg.libXpm
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
'';
passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
passthru = { gtk = gtk2; }; # probably its a good idea to use the same gtk in plugins ?
#configureFlags = [ "--disable-print" ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk, glib,
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib,
pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }:
stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
installPhase = "scons install";
buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
buildInputs = [ gdk_pixbuf pkgconfig gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
json_glib ];
meta = {

View file

@ -1,9 +1,9 @@
{stdenv, fetchurl, pkgconfig, gtk, libpng}:
{stdenv, fetchurl, pkgconfig, gtk2, libpng}:
assert pkgconfig != null && gtk != null && libpng != null;
assert pkgconfig != null && gtk2 != null && libpng != null;
# Note that we cannot just copy gtk's png attribute, since gtk might
# not be linked against png.
# !!! assert libpng == gtk.libpng;
# !!! assert libpng == gtk2.libpng;
stdenv.mkDerivation {
name = "gqview-2.1.5";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj";
};
buildInputs = [pkgconfig gtk libpng];
buildInputs = [pkgconfig gtk2 libpng];
hardeningDisable = [ "format" ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, gtk, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
, gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge
, libvisio, libcdr, libexif, unzip, automake114x, autoconf
@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
makeWrapper intltool gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif automake114x autoconf
] ++ stdenv.lib.optional boxMakerPlugin unzip;

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, unzip, ftgl, glew, asciidoc
, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu }:
, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
stdenv.mkDerivation rec {
version = "0.8.0.5";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff
gettext intltool perl unzip ftgl glew asciidoc
gtkmm glibmm gtkglext pangox_compat libXmu
gtkmm2 glibmm gtkglext pangox_compat libXmu
];
#doCheck = false;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gettext, glib, gtk, hicolor_icon_theme, json_c
{ stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c
, lcms2, libpng , makeWrapper, pkgconfig, pygtk, python, pythonPackages
, scons, swig
}:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
gettext glib gtk json_c lcms2 libpng makeWrapper pkgconfig pygtk
gettext glib gtk2 json_c lcms2 libpng makeWrapper pkgconfig pygtk
python scons swig
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, getopt, which, pkgconfig, gtk } :
{ stdenv, fetchurl, getopt, which, pkgconfig, gtk2 } :
stdenv.mkDerivation (rec {
name = "pqiv-0.12";
@ -8,7 +8,7 @@ stdenv.mkDerivation (rec {
sha256 = "646c69f2f4e7289913f6b8e8ae984befba9debf0d2b4cc8af9955504a1fccf1e";
};
buildInputs = [ getopt which pkgconfig gtk ];
buildInputs = [ getopt which pkgconfig gtk2 ];
preConfigure=''
substituteInPlace configure --replace /bin/bash "$shell"

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file, lcms2, libexif } :
{ stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } :
stdenv.mkDerivation (rec {
version = "2.3.1";
@ -9,7 +9,7 @@ stdenv.mkDerivation (rec {
sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7";
};
buildInputs = [ pkgconfig gtk imlib2 file lcms2 libexif ];
buildInputs = [ pkgconfig gtk2 imlib2 file lcms2 libexif ];
preBuild=''
substituteInPlace Makefile --replace /usr/local "$out"

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat, pcre, libsigcxx
{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau
, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx
, mercurial # Not really needed for anything, but it fails if it does not find 'hg'
}:
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr";
};
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
lcms2 libiptcdata mercurial libcanberra fftw expat pcre libsigcxx ];
buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
lcms2 libiptcdata mercurial libcanberra_gtk2 fftw expat pcre libsigcxx ];
patchPhase = ''
patch -p1 < ${./sigc++_fix.patch}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}:
{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null}:
stdenv.mkDerivation rec {
name = "sane-frontends-1.0.14";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
'';
buildInputs = [sane-backends libX11 gtk pkgconfig] ++
buildInputs = [sane-backends libX11 gtk2 pkgconfig] ++
(if libusb != null then [libusb] else []);
meta = {

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng
{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng
, libusb ? null
, gimpSupport ? false, gimp_2_8 ? null
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
chmod a+rX -R .
'';
buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ]
buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ]
++ (if libusb != null then [libusb] else [])
++ stdenv.lib.optional gimpSupport gimp_2_8;

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib
{ fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib
, libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig gtk gtkimageview gettext bzip2 zlib
[ pkgconfig gtk2 gtkimageview gettext bzip2 zlib
libjpeg libtiff cfitsio exiv2 lcms2 lensfun
];

View file

@ -1,5 +1,5 @@
{stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig
, wxGTK, gtk, perl, zip}:
, wxGTK, gtk2, perl, zip}:
stdenv.mkDerivation {
name = "xaralx-0.7r1785";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ automake pkgconfig gettext perl zip ];
buildInputs = [ wxGTK gtk libxml2 freetype pango ];
buildInputs = [ wxGTK gtk2 libxml2 freetype pango ];
configureFlags = "--disable-svnversion";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl
, ghostscript, atk, gtk, glib, fontconfig, freetype
, ghostscript, atk, gtk2, glib, fontconfig, freetype
, libgnomecanvas, libgnomeprint, libgnomeprintui
, pango, libX11, xproto, zlib, poppler
, autoconf, automake, libtool, pkgconfig}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
ghostscript atk gtk glib fontconfig freetype
ghostscript atk gtk2 glib fontconfig freetype
libgnomecanvas libgnomeprint libgnomeprintui
pango libX11 xproto zlib poppler
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk, pkgconfig, texinfo }:
{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }:
stdenv.mkDerivation rec {
name = "xzgv-${version}";
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph";
};
buildInputs = [ gtk pkgconfig texinfo ];
buildInputs = [ gtk2 pkgconfig texinfo ];
patches = [ ./fix-linker-paths.patch ];
postPatch = ''
substituteInPlace config.mk \

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk, glib
{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
, gdk_pixbuf }:
assert stdenv.system == "i686-linux";
@ -20,7 +20,7 @@ stdenv.mkDerivation {
# versions.
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ];
[ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk_pixbuf ];
passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }:
{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }:
stdenv.mkDerivation rec {
name = "artha-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx";
};
buildInputs = [ dbus_glib gtk pkgconfig wordnet ];
buildInputs = [ dbus_glib gtk2 pkgconfig wordnet ];
meta = with stdenv.lib; {
description = "An offline thesaurus based on WordNet";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk, xdg_utils }:
{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk2, xdg_utils }:
stdenv.mkDerivation rec {
name = "avrdudess-2.2.20140102";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
cat >> "$out/bin/avrdudess" << __EOF__
#!${stdenv.shell}
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}"
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}"
# We need PATH from user env for xdg-open to find its tools, which
# typically depend on the currently running desktop environment.
export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH"

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl
, pkgconfig, gettext, pythonPackages
, gtk, gdk_pixbuf, upower
, gtk2, gdk_pixbuf, upower
, makeWrapper }:
let
inherit (pythonPackages) dbus-python pygtk python;
inherit (pythonPackages) dbus-python pygtk2 python;
in stdenv.mkDerivation rec {
name = "batti-${version}";
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = with stdenv.lib;
[ pkgconfig gettext python gtk pygtk dbus-python gdk_pixbuf upower makeWrapper ];
[ pkgconfig gettext python gtk2 pygtk2 dbus-python gdk_pixbuf upower makeWrapper ];
configurePhase = "true";

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, intltool, pkgconfig, gtk, xdotool }:
{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }:
stdenv.mkDerivation rec {
name = "clipit-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva";
};
buildInputs = [ intltool pkgconfig gtk xdotool ];
buildInputs = [ intltool pkgconfig gtk2 xdotool ];
meta = with stdenv.lib; {
description = "Lightweight GTK+ Clipboard Manager";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }:
{ stdenv, fetchurl, gtk2, glib, pkgconfig, openssl, boost }:
stdenv.mkDerivation {
name = "d4x-2.5.7.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m";
};
buildInputs = [ gtk glib pkgconfig openssl boost ];
buildInputs = [ gtk2 glib pkgconfig openssl boost ];
meta = {
description = "Graphical download manager";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig,
librsvg, glib, gtk, libXext, libXxf86vm, poppler, xineLib }:
librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib }:
stdenv.mkDerivation rec {
name = "eaglemode-0.86.0";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig
librsvg glib gtk libXxf86vm libXext poppler xineLib ];
librsvg glib gtk2 libXxf86vm libXext poppler xineLib ];
# The program tries to dlopen both Xxf86vm and Xext, so we use the
# trick on NIX_LDFLAGS and dontPatchELF to make it find them.

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk, poppler }:
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }:
stdenv.mkDerivation rec {
name = "epdfview-0.1.8";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll";
};
buildInputs = [ pkgconfig gtk poppler ];
buildInputs = [ pkgconfig gtk2 poppler ];
hardeningDisable = [ "format" ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchgit, makeWrapper, pkgconfig,
gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
configH
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11
gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11
xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig
];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext
, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx }:
, fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }:
stdenv.mkDerivation rec{
@ -11,7 +11,7 @@ stdenv.mkDerivation rec{
sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d";
};
buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm glibmm libglademm libsigcxx ];
buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ];
preConfigure = ''
./autogen.sh

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE
{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE
, IOKit ? null }:
stdenv.mkDerivation rec {
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh";
};
buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE]
buildInputs = [gettext pkgconfig glib gtk2 libX11 libSM libICE]
++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
hardeningDisable = [ "format" ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, gnome3, libgksu,
{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu,
intltool, libstartup_notification, gtk_doc, wrapGAppsHook
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk gnome3.gconf libstartup_notification gnome3.libgnome_keyring
gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring
];
propagatedBuildInputs = [

View file

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } :
{ stdenv, fetchsvn, libxml2, gtk2, curl, pkgconfig } :
let
version = "31801";
@ -15,7 +15,7 @@ stdenv.mkDerivation {
ignoreExternals = true;
};
buildInputs = [ libxml2 gtk curl ];
buildInputs = [ libxml2 gtk2 curl ];
nativeBuildInputs = [ pkgconfig ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, gpgme, libgpgerror, libassuan }:
{ stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }:
stdenv.mkDerivation rec {
name = "gpa-0.9.9";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38";
};
buildInputs = [ intltool pkgconfig gtk gpgme libgpgerror libassuan ];
buildInputs = [ intltool pkgconfig gtk2 gpgme libgpgerror libassuan ];
meta = with stdenv.lib; {
description = "Graphical user interface for the GnuPG";

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk
{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk2
, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
pkgconfig exiv2 libxml2 gtk
pkgconfig exiv2 libxml2 gtk2
libxslt docbook_xsl docbook_xml_dtd_42
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk }:
{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk2 }:
stdenv.mkDerivation rec {
name = "green-pdfviewer-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj";
};
buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk ];
buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk2 ];
patches = [
./gdk-libs.patch

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
{ stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte
, curl, cdparanoia, libid3tag, ncurses, libtool }:
stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl";
};
buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia
buildInputs = [ gtk2 glib pkgconfig libgnome libgnomeui vte curl cdparanoia
libid3tag ncurses libtool ];
hardeningDisable = [ "format" ];

View file

@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme
];
propagatedBuildInputs = with pythonPackages; [ pygobject pygtk pyxdg gnome_python dbus-python sqlite3 ];
propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python sqlite3 ];
configurePhase = ''
python waf configure --prefix="$out"

View file

@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, dpkg, gtk, atk, glib, pango, gdk_pixbuf, cairo
{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, db, gtk, bzip2 }:
{ stdenv, fetchurl, db, gtk2, bzip2 }:
stdenv.mkDerivation {
name = "jigdo-0.7.3";
@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "0cp4jz3sg9g86vprh90pmwpcfla79f0dr50w14yh01k0yaq70fs8";
};
buildInputs = [ db gtk bzip2 ];
buildInputs = [ db gtk2 bzip2 ];
configureFlags = "--without-libdb";

View file

@ -1,7 +1,7 @@
{ stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig
, zip, python, zlib, which, icu, libmicrohttpd, lzma, ctpp2, aria2, wget, bc
, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib
, gtk, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk
, gtk2, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk
}:
let
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
rm $out/bin/kiwix
makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
--suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
--suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
--suffix PATH : ${aria2}/bin
'';

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig
, libX11, libxcb, cairo, gtk, pango, python27, python3
, libX11, libxcb, cairo, gtk2, pango, python27, python3
}:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
pkgconfig libX11 libxcb cairo gtk pango python27 python3
pkgconfig libX11 libxcb cairo gtk2 pango python27 python3
];
makeFlags = [ "PREFIX=\${out}" ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }:
{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }:
stdenv.mkDerivation rec {
name = "lxappearance-0.6.1";
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9";
};
buildInputs = [ intltool libX11 pkgconfig gtk ];
buildInputs = [ intltool libX11 pkgconfig gtk2 ];
meta = {
description = "A lightweight program for configuring the theme and fonts of gtk applications";
maintainers = [ stdenv.lib.maintainers.hinton ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk, glib, ORBit2, libbonobo, libtool, pkgconfig
{ stdenv, fetchurl, gtk2, glib, ORBit2, libbonobo, libtool, pkgconfig
, libgnomeui, GConf, automake, autoconf }:
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
buildInputs =
[ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
[ gtk2 glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
automake autoconf
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, pkgconfig, gtk, SDL, fontconfig, freetype, imlib2, SDL_image, mesa,
{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, mesa,
libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}:
stdenv.mkDerivation rec {
name = "navit-svn-3537";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [ gtk SDL fontconfig freetype imlib2 SDL_image mesa
buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image mesa
libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ];
nativeBuildInputs = [ pkgconfig cmake ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk, menu-cache }:
{ stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }:
stdenv.mkDerivation rec {
name = "openbox-menu-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
};
buildInputs = [ pkgconfig glib gtk menu-cache ];
buildInputs = [ pkgconfig glib gtk2 menu-cache ];
patches = [ ./with-svg.patch ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }:
{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }:
stdenv.mkDerivation rec {
name = "pcmanfm-1.2.4";
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "04z3vd9si24yi4c8calqncdpb9b6mbj4cs4f3fs86i6j05gvpk9q";
};
buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ];
buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ];
meta = with stdenv.lib; {
homepage = "http://blog.lxde.org/?cat=28/";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib
, mono, gtk-sharp, gnome-sharp, hyena
, mono, gtk-sharp-2_0, gnome-sharp, hyena
, which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
}) ];
buildInputs = [
pkgconfig gnome_doc_utils intltool mono gtk-sharp gnome-sharp
pkgconfig gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp
hyena which makeWrapper wrapGAppsHook
];
@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
postInstall = ''
makeWrapper "${mono}/bin/mono" "$out/bin/pdfmod" \
--add-flags "$out/lib/pdfmod/PdfMod.exe" \
--prefix MONO_GAC_PREFIX : ${gtk-sharp} \
--prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
--prefix MONO_GAC_PREFIX : ${gnome-sharp} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp gtk-sharp.gtk poppler ]}
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]}
'';
dontStrip = true;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, pythonPackages, gnome }:
{ stdenv, fetchFromGitLab, pythonPackages, gnome2 }:
stdenv.mkDerivation rec {
name = "pmenu-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pythonPackages.wrapPython ];
buildInputs = [ pythonPackages.pygtk gnome.gnome_menus ];
buildInputs = [ pythonPackages.pygtk gnome2.gnome_menus ];
pythonPath = [ pythonPackages.pygtk ];

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, gettext, gtk, gconf
{ fetchurl, stdenv, pkgconfig, gettext, gtk2, gconf
, curl, libexif, sqlite, libxml2 }:
stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516";
};
buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite libxml2 ];
buildInputs = [ pkgconfig gettext gtk2 gconf curl libexif sqlite libxml2 ];
# bogus includes fail with newer library version
postPatch = ''

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre
, glib , imlib2, gtk, libXinerama , libXrender, libXcomposite, libXdamage
, glib , imlib2, gtk2, libXinerama , libXrender, libXcomposite, libXdamage
, libX11 , libXrandr, librsvg, libpthreadstubs , libXdmcp
, libstartup_notification , hicolor_icon_theme, wrapGAppsHook
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ];
buildInputs = [ cairo pango pcre glib imlib2 gtk libXinerama libXrender
buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender
libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs
libXdmcp libstartup_notification hicolor_icon_theme ];

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl
{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz";
};
buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
buildInputs = [ makeWrapper pkgconfig intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch
, autoconf, automake, gettext, intltool, libtool, pkgconfig
, libICE, libSM, libXScrnSaver, libXtst, cheetah
, glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm
, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm
, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
stdenv.mkDerivation rec {
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libICE libSM libXScrnSaver libXtst cheetah
glib glibmm gtk gtkmm atk pango pangomm cairo cairomm
glib glibmm gtkmm2 atk pango pangomm cairo cairomm
dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx
];

Some files were not shown because too many files have changed in this diff Show more