diff options
Diffstat (limited to 'pkgs/applications')
10 files changed, 38 insertions, 74 deletions
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 63917cac6c09..f7330ee12f91 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype +{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis , libsndfile, libogg }: @@ -13,12 +13,10 @@ stdenv.mkDerivation { }; buildInputs = [ - pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf + pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg ]; - preConfigure = "autoreconf -vfi"; - patches = [ ./am_path_sdl.patch ./xml.patch ]; meta = { diff --git a/pkgs/applications/audio/ladspa-plugins/git.nix b/pkgs/applications/audio/ladspa-plugins/git.nix index e9ab932a88e4..e022a35f5c64 100644 --- a/pkgs/applications/audio/ladspa-plugins/git.nix +++ b/pkgs/applications/audio/ladspa-plugins/git.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchgit, automake, autoreconfHook, fftw, gettext, ladspaH, libxml2, pkgconfig, perl, perlPackages }: +{ stdenv, fetchgit, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig +, perl, perlPackages }: stdenv.mkDerivation { name = "swh-plugins-git-2015-03-04"; @@ -9,7 +10,7 @@ stdenv.mkDerivation { sha256 = "7d9aa13a064903b330bd52e35c1f810f1c8a253ea5eb4e5a3a69a051af03150e"; }; - buildInputs = [ automake autoreconfHook fftw gettext ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ]; + buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ]; patchPhase = '' patchShebangs . @@ -17,11 +18,6 @@ stdenv.mkDerivation { cp ${automake}/share/automake-*/mkinstalldirs . ''; - configurePhase = '' - autoreconf -i - ./configure --prefix=$out - ''; - meta = with stdenv.lib; { homepage = http://plugin.org.uk/; description = "LADSPA format audio plugins"; diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index 26f313f038df..d72ab12b580d 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -1,4 +1,4 @@ -{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }: +{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoreconfHook }: let date = "2013-03-21"; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5"; }; - buildInputs = [ emacs w3m texinfo autoconf ]; + buildInputs = [ emacs w3m texinfo autoreconfHook ]; # XXX: Should we do the same for xpdf/evince, gv, gs, etc.? patchPhase = '' @@ -26,11 +26,10 @@ stdenv.mkDerivation rec { s|(w3m-which-command "identify")|"${imagemagick}/bin/identify"|g' ''; - configurePhase = '' - autoreconf -vfi && \ - ./configure --prefix="$out" --with-lispdir="$out/share/emacs/site-lisp" \ - --with-icondir="$out/share/emacs/site-lisp/images/w3m" - ''; + configureFlags = [ + "--with-lispdir=$out/share/emacs/site-lisp" + "--with-icondir=$out/share/emacs/site-lisp/images/w3m" + ]; postInstall = '' cd "$out/share/emacs/site-lisp" diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 67513bcf9230..069eea3b521b 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit,autoconf, automake, gcc, fltk13 -, libjpeg, libpng, libtool, mesa, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, fltk13 +, libjpeg, libpng, mesa, pkgconfig }: stdenv.mkDerivation { name = "solvespace-2.0"; @@ -14,27 +14,15 @@ stdenv.mkDerivation { dontBuild = true; enableParallelBuilding = false; - buildInputs = [ - autoconf - automake - gcc + buildInputs = [ + autoreconfHook fltk13 libjpeg libpng - libtool mesa pkgconfig - stdenv ]; - preConfigure = '' - aclocal - libtoolize - - autoreconf -i - automake --add-missing - ''; - meta = { description = "A parametric 3d CAD program"; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index bccfd95e32bf..330970b498ba 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,11 +1,9 @@ -{ stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }: +{ stdenv, fetchgit, autoreconfHook, automake, pkgconfig, libxml2 }: stdenv.mkDerivation rec { name = "evtest-1.32"; - preConfigure = "autoreconf -iv"; - - buildInputs = [ autoconf automake pkgconfig libxml2 ]; + buildInputs = [ autoreconfHook pkgconfig libxml2 ]; src = fetchgit { url = "git://anongit.freedesktop.org/evtest"; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index eddf9b8ac717..16a20015c629 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext +{ stdenv, fetchurl, makeWrapper, autoreconfHook, boost, file , glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool , libctemplate, libglade , libiodbc -, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql +, libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql , pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo }: @@ -16,18 +16,14 @@ stdenv.mkDerivation rec { sha256 = "1343fn3msdxqfpxw0kgm0mdx5r7g9ra1cpc8p2xhl7kz2pmqp4p6"; }; - buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool - libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa + buildInputs = [ autoreconfHook boost file glib glibc libgnome_keyring gtk gtkmm intltool + libctemplate libglade libgnome libiodbc libsigcxx libuuid libxml2 libzip lua makeWrapper mesa mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; preConfigure = '' substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv" ''; - postConfigure = '' - autoreconf -fi - ''; - postInstall = '' patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 6d8edec91031..9f11a141ff43 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig +{ stdenv, fetchurl, autoreconfHook, pkgconfig , libX11, libXinerama, pango, cairo , libstartup_notification, i3Support ? false, i3 }: @@ -12,14 +12,10 @@ stdenv.mkDerivation rec { sha256 = "112fgx2awsw1xf1983bmy3jvs33qwyi8qj7j59jqc4gx07nv1rp5"; }; - buildInputs = [ autoconf automake pkgconfig libX11 libXinerama pango + buildInputs = [ autoreconfHook pkgconfig libX11 libXinerama pango cairo libstartup_notification ] ++ stdenv.lib.optional i3Support i3; - preConfigure = '' - autoreconf -vif - ''; - meta = { description = "Window switcher, run dialog and dmenu replacement"; homepage = https://davedavenport.github.io/rofi; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 7cfa12eccb4d..367c837228a7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoconf, automake, libtool -, libsodium } : +{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }: let version = "dd181722ea"; @@ -17,11 +16,9 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lssp -lsodium"; - preConfigure = "autoreconf -vfi"; - postInstall = "mv $out/lib/purple-2 $out/lib/pidgin"; - buildInputs = [ libtoxcore pidgin autoconf automake libtool libsodium ]; + buildInputs = [ libtoxcore pidgin autoreconfHook libsodium ]; meta = { homepage = http://tox.dhs.org/; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index d4da5c113c99..86b0ffbcf24c 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext, glib, cairo +, lua, mesa, pkgconfig, perl, autoreconfHook, glib, cairo , pango, gdk_pixbuf, atk }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { }; buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua - perl automake autoconf libtool gettext ]; + perl autoreconfHook ]; patchPhase = '' patch -Np0 -i "${gcc46Patch}" @@ -53,18 +53,15 @@ stdenv.mkDerivation { patch -Np2 -i "${libpng16Patch}" patch -Np1 -i "${linkingPatch}" patch -Np1 -i "${gcc47Patch}" - autoreconf - configureFlagsArray=( - --with-gtk - --with-lua=${lua} - CPPFLAGS="-DNDEBUG" - CFLAGS="-O2 -fsigned-char" - CXXFLAGS="-O2 -fsigned-char" - GTK_CFLAGS="-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include" - GTK_LIBS="-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0" - ) ''; + configureFlags = "--with-gtk --with-lua=${lua}"; + CPPFLAGS = "-DNDEBUG"; + CFLAGS = "-O2 -fsigned-char"; + CXXFLAGS = "-O2 -fsigned-char"; + GTK_CFLAGS = "-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"; + GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"; + installPhase = ''make MKDIR_P="mkdir -p" install''; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index e8c6b39f4933..1cd33e8b97a5 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake, - libmspack, openssl, pam, xercesc, icu, libdnet, procps, +{ stdenv, lib, fetchurl, makeWrapper, autoreconfHook, + libmspack, openssl, pam, xercesc, icu, libdnet, procps, xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst, pkgconfig, glib, gtk, gtkmm }: @@ -16,8 +16,8 @@ in stdenv.mkDerivation { sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1"; }; - buildInputs = - [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps + buildInputs = + [ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ]; patchPhase = '' @@ -28,7 +28,6 @@ in stdenv.mkDerivation { patches = [ ./recognize_nixos.patch ]; - preConfigure = "autoreconf"; configureFlags = "--without-kernel-modules --without-xmlsecurity"; meta = with stdenv.lib; { |