diff options
Diffstat (limited to 'pkgs')
37 files changed, 326 insertions, 326 deletions
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 0359e9c711d..c9f0fb98af7 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,7 +1,10 @@ -args: with args; +{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor +, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2 +, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango +, gtk, glibmm, gtkmm, libgnomecanvas, librdf, liblo, aubio +, fftwSinglePrec, libmad }: stdenv.mkDerivation { - name = "ardour-2.8.2"; # svn is the source to get official releases from their site? @@ -13,11 +16,10 @@ stdenv.mkDerivation { }; buildInputs = [ - scons boost - pkgconfig fftw librdf_raptor librdf_rasqal jackaudio flac - libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx libusb cairomm - glib pango gtk glibmm gtkmm libgnomecanvas fftw librdf liblo aubio - fftw fftwSinglePrec libmad + scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio + flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx + libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas librdf + liblo aubio fftwSinglePrec libmad ]; buildPhase = '' @@ -35,7 +37,7 @@ stdenv.mkDerivation { ''; homepage = http://ardour.org/; license = "GPLv2"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 8cd98aef136..a3910fae2bf 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,4 +1,7 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft +, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm +, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool +, gsl, python, pyxml, lxml }: stdenv.mkDerivation rec { name = "inkscape-0.47"; @@ -45,6 +48,5 @@ stdenv.mkDerivation rec { If you want to import .eps files install ps2edit. ''; - }; } diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index f4ad3cc8421..4eb4c441c99 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }: + stdenv.mkDerivation { name = "d4x-2.5.7.1"; @@ -12,11 +13,12 @@ stdenv.mkDerivation { configurePhase = "./configure --prefix=\$out " + " --with-boost-libdir=\$boost/lib" + " --with-boost-includedir=\$boost/include"; - buildInputs = [gtk glib pkgconfig openssl boost]; + + buildInputs = [ gtk glib pkgconfig openssl boost ]; meta = { - description = "graphical download manager"; - homepage = http://www.krasu.ru/soft/chuchelo/; - license = "Artistic"; + description = "Graphical download manager"; + homepage = http://www.krasu.ru/soft/chuchelo/; + license = "Artistic"; }; } diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index a82715fc13c..6b08069054c 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte +, curl, cdparanoia, libid3tag }: stdenv.mkDerivation { name = "grip-3.2.0"; @@ -8,13 +9,13 @@ stdenv.mkDerivation { sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas"; }; - buildInputs = [gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag]; + buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ]; meta = { - description = "GTK+ based Audio CD Player/Ripper"; + description = "GTK+-based audio CD player/ripper"; homepage = http://nostatic.org/grip; license = "GPLv2"; - maintainers = [args.lib.maintainers.marcweber]; + maintainers = [ stdenv.lib.maintainers.marcweber ]; #platforms = args.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 69ec74337df..6ceca2ea871 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, db45, gtk, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; @@ -9,18 +9,18 @@ stdenv.mkDerivation { sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv"; }; - buildInputs = [db45 gtk bzip2]; + patches = fetchurl { + url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz; + sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3"; + }; + + buildInputs = [ db45 gtk bzip2 ]; configureFlags = "--without-libdb"; meta = { - description = "tool designed to ease the distribution of very large files over the internet"; + description = "Download utility that can fetch files from several sources simultaneously"; homepage = http://atterer.net/jigdo/; license = "GPLv2"; }; - - patches = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz; - sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3"; - }; } diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index e7d83fd828e..b11b234eb43 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -1,12 +1,13 @@ -args: with args; -stdenv.mkDerivation { +{ stdenv, fetchurl, libX11, libXft, libXi, inputproto, libSM, libICE +, freetype, pkgconfig, which }: +stdenv.mkDerivation { name = "mrxvt-0.5.4"; - buildInputs = [libX11 libXft libXi inputproto libSM libICE - freetype pkgconfig which]; + buildInputs = + [ libX11 libXft libXi inputproto libSM libICE freetype pkgconfig which ]; - configureFlags=[ + configureFlags = [ "--with-x" "--enable-frills" "--enable-xft" @@ -17,7 +18,7 @@ stdenv.mkDerivation { "--with-save-lines=10000" ]; - preConfigure='' + preConfigure = '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"; ''; @@ -27,10 +28,10 @@ stdenv.mkDerivation { }; meta = { - description = "lightweight multitabbed feature-rich X11 terminal emulator"; + description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " Multitabbed lightweight terminal emulator based on rxvt. - Supports transparency, backgroundimages, freetype fonts,.. + Supports transparency, backgroundimages, freetype fonts, ... "; homepage = http://sourceforge.net/projects/materm; license = "GPL"; diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix index af6bc072e53..8fd04353969 100644 --- a/pkgs/applications/misc/multisync/default.nix +++ b/pkgs/applications/misc/multisync/default.nix @@ -1,15 +1,19 @@ -args: with args; - +{ stdenv, fetchurl, gtk, glib, ORBit2, libbonobo, libtool, pkgconfig +, libgnomeui, GConf, automake, autoconf }: stdenv.mkDerivation { name = "multisync-0.82-1"; + src = fetchurl { url = mirror://sourceforge/multisync/multisync-0.82-1.tar.bz2; sha256 = "1azb6zsn3n1rnla2qc3c440gc4vgmbj593k6xj5g1v0xha2vm2y3"; }; - buildInputs = [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf - automake autoconf - ]; + + buildInputs = + [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf + automake autoconf + ]; + preConfigure = "./autogen.sh"; # install.sh is not contained in the tar meta = { diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 00d4fe99ba3..798f9eeec20 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -1,5 +1,7 @@ # translations still misssing -args: with args; + +{ stdenv, fetchurl, qt3, libpng, libXext, libX11 }: + stdenv.mkDerivation { name = "qcad-2.0.5.0-1-community"; @@ -15,7 +17,7 @@ stdenv.mkDerivation { cd .. ''; - buildInputs = [qt3 libpng libXext libX11]; + buildInputs = [ qt3 libpng libXext libX11 ]; patchPhase = '' sed -i 's/-pedantic//' mkspecs/defs.pro @@ -35,8 +37,8 @@ stdenv.mkDerivation { ''; meta = { - description="A 2D CAD package based upon Qt."; - homepage = http://www.ribbonsoft.de/qcad.html; - license = "GPLv2"; # community edition + description = "A 2D CAD package based upon Qt"; + homepage = http://www.ribbonsoft.de/qcad.html; + license = "GPLv2"; # community edition }; } diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix index 58366c6aa04..13597f3ee9b 100644 --- a/pkgs/applications/misc/rxvt/default.nix +++ b/pkgs/applications/misc/rxvt/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, libX11, libXt }: + stdenv.mkDerivation { name = "rxvt-2.6.4"; @@ -10,8 +11,8 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXt ]; meta = { - description = "colour vt102 terminal emulator with less features and lower memory consumption"; - homepage = http://www.rxvt.org/; - license = "GPL"; + description = "Colour vt102 terminal emulator with less features and lower memory consumption"; + homepage = http://www.rxvt.org/; + license = "GPL"; }; } diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index f8c494cb8ed..cb79bf592fe 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,4 +1,6 @@ -args: with args; +{ stdenv, fetchurl, x11, xextproto, libXtst, inputproto, libXi +, automake, autoconf, sourceFromHead }: + stdenv.mkDerivation { name = "synergy-cvs"; @@ -10,18 +12,20 @@ stdenv.mkDerivation { (fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_23-55-02.tar.gz"; sha256 = "ae16a9b59039a32e383e71397405d7b610de6c6902c03177c2496bac440d3e28"; }); # END - buildInputs = [x11 xextproto libXtst inputproto libXi automake autoconf autoconf]; + buildInputs = [ x11 xextproto libXtst inputproto libXi automake autoconf ]; - preConfigure = "autoreconf; "; + preConfigure = "autoreconf"; - patches = [ (fetchurl { - url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz; - sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7"; - }) ]; + patches = + [ (fetchurl { + url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz; + sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7"; + }) + ]; - meta= { - description = "share mouse keyboard and clipboard between computers"; - homepage = http://synergy2.sourceforge.net; - license = "GPL"; + meta = { + description = "Tool to share the mouse keyboard and the clipboard between computers"; + homepage = http://synergy2.sourceforge.net; + license = "GPL"; }; } diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 9f6a8a59e72..55d6a9c16b0 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,16 +1,24 @@ -args: with args; +{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }: stdenv.mkDerivation rec { name = "xterm-231"; + src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; sha256 = "0qlz5nkdqkahdg9kbd1ni96n69srj1pd9yggwrw3z0kghaajb2sr"; }; - buildInputs = [libXaw xproto libXt libXext libX11 libSM libICE ncurses - freetype pkgconfig libXft luit]; - configureFlags = "--enable-wide-chars --enable-256-color - --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit - --enable-mini-luit --with-tty-group=tty"; + + buildInputs = + [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE + ncurses freetype pkgconfig xorg.libXft xorg.luit + ]; + + configureFlags = + '' + --enable-wide-chars --enable-256-color + --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit + --enable-mini-luit --with-tty-group=tty + ''; # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp', # decided by the sysadmin to allow the xterm reporting to /var/run/utmp diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 29aab0bf68b..6e3d57b78a8 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi, libpng, popt, libgsf, -enchant, wv, librsvg, bzip2 +{ stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi +, libpng, popt, libgsf, enchant, wv, librsvg, bzip2 }: stdenv.mkDerivation { name = "abiword-2.8.6"; + src = fetchurl { url = http://www.abisource.org/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz; sha256 = "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r"; }; - buildInputs = [pkgconfig gtk libglade librsvg bzip2 - libgnomecanvas fribidi libpng popt libgsf enchant wv - ]; + buildInputs = + [ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt + libgsf enchant wv + ]; } diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 021681e4efd..e52cb91ec4b 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,17 +1,20 @@ -args: with args; +{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft }: stdenv.mkDerivation { - name="jwm-2.0.1"; + name = "jwm-2.0.1"; + src = fetchurl { url = http://www.joewing.net/programs/jwm/releases/jwm-2.0.1.tar.bz2; sha256 = "1ix5y00cmg3cyazl0adzgv49140zxaf2dpngyg1dyy4ma6ysdmnw"; }; - buildInputs = [libX11 libXext libXinerama libXpm libXft]; + buildInputs = [ libX11 libXext libXinerama libXpm libXft ]; - postInstall = '' - sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc - sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc''; + postInstall = + '' + sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc + sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc + ''; meta = { description = "A window manager for X11 that requires only Xlib"; diff --git a/pkgs/build-support/deb-package/default.nix b/pkgs/build-support/deb-package/default.nix deleted file mode 100644 index f227dd521a6..00000000000 --- a/pkgs/build-support/deb-package/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -args : with args; - let - localDefs = with (builderDefs.passthru.function {src="";}); - let - checkFlag = flag : lib.attrByPath [flag] false args; - in - builderDefs.passthru.function ({ - inherit src; - inherit checkFlag; - buildInputs = []; - configureFlags = []; - makeFlags = if (checkFlag "omitConfigure") - then [" PREFIX=$out "] - else []; - patch = null; - meta = {}; - doInstall = if args ? Install then - (fullDepEntry - args.Install - (["doMake"] - ++ (lib.attrByPath ["extraInstallDeps"] [] args)) - ) - else fullDepEntry "" ["doMakeInstall"]; - - debPatch = fullDepEntry ((if args ? patch then '' - gunzip < ${args.patch} | patch -Np1 - '' else "") - +'' - sed -e 's/-o root//' -i Makefile Makefile.in Makefile.new || true; - sed -e 's/-g root//' -i Makefile Makefile.in Makefile.new || true; - '' - +(if (checkFlag "omitFilePatches") then "" else - '' - if test -d debian/patches; then - for i in debian/patches/*; do - patch -Np0 -i $i; - done; - fi; - '') - + (if args ? extraReplacements then - args.extraReplacements - else ""))["minInit" "doUnpack"]; - } // args); - in with localDefs; -stdenv.mkDerivation rec { - name = localDefs.name + "deb"; - builder = writeScript (name + "-builder") - (textClosure localDefs ([debPatch] ++ - (lib.optional (patches != []) "doPatch") ++ - (lib.optional (! (checkFlag "omitConfigure")) "doConfigure") ++ - [doInstall doForceShare])); - inherit meta; - inherit src; -} diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 6a0bb54e516..76d2f3b28c1 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,28 +1,37 @@ -args: with args; with debPackage; -debBuild ({ - src = fetchurl { - url = mirror://debian/pool/main/u/unifont/unifont_5.1.20080914.orig.tar.gz; - sha256 = "1p8f3dkg0zy9f5hwn1q728hps258ll84xg9a7xqbhj2csvnsyajd"; +{ stdenv, fetchurl, mkfontscale, mkfontdir, bdftopcf, fontutil }: + +let + + ttf = fetchurl { + url = http://unifoundry.com/unifont-5.1.20080907.ttf.gz; + sha256 = "03ssxsfhnayarzx15mn6khry2kgdxhkkc1bqzgr0c85ab5xm9jxw"; }; - patch = fetchurl { - url = mirror://debian/pool/main/u/unifont/unifont_5.1.20080914-1.diff.gz; - sha256 = "0faicwbjlgy78zrc94ffg52f71msll8kxc43bks40z8qb02nr7qx"; + + pcf = fetchurl { + url = http://unifoundry.com/unifont-5.1.20080820.pcf.gz; + sha256 = "0qwsgaplb2a79w14rrvazby3kwx7vyk08x70n0ih5dr91x3rqaqj"; }; - name = "unifont-5.1-20080914"; - buildInputs = [mkfontscale mkfontdir bdftopcf fontutil perl]; + +in + +stdenv.mkDerivation { + name = "unifont-5.1-20080907"; + + buildInputs = [ mkfontscale mkfontdir bdftopcf fontutil ]; + + unpackPhase = "true"; + + installPhase = + '' + ensureDir $out/share/fonts $out/share/fonts/truetype + cp ${pcf} $out/share/fonts/unifont.pcf.gz + gunzip < ${ttf} > $out/share/fonts/truetype/unifont.ttf + cd $out/share/fonts + mkfontdir + mkfontscale + ''; + meta = { description = "Unicode font for Base Multilingual Plane."; }; - #extraReplacements = ''sed -e s@/usr/bin/perl@${perl}/bin/perl@ -i hex2bdf.unsplit''; - omitConfigure = true; - Install = '' - ensureDir $out/share/fonts $out/share/fonts/truetype - cd font/precompiled - cp unifont.pcf.gz $out/share/fonts - cp unifont.ttf $out/share/fonts/truetype - cd $out/share/fonts - mkfontdir - mkfontscale - ''; - extraInstallDeps = ["defEnsureDir"]; -} // args) +} diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index ee8474947f8..060d59476cf 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,16 +1,17 @@ -args: with args; +{ composableDerivation, lib, fetchurl, mysql, apacheHttpd, zlib, sqlite +, pcre, apr, gtk, boehmgc, pkgconfig, makeWrapper, sourceFromHead }: let - inherit (args.composableDerivation) composableDerivation edf wwf; + inherit (composableDerivation) edf wwf; - libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk]; + libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk ]; includes = lib.concatMapStrings (x: ''"${x}/include",'' ) libs + ''"{gkt}/include/gtk-2.0",''; in -composableDerivation {} ( fixed : { +composableDerivation.composableDerivation {} ( fixed : { name = "neko-cvs"; @@ -19,11 +20,6 @@ composableDerivation {} ( fixed : { (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_16-06-48.tar.gz"; sha256 = "e952582a26099b7a5568d0798839a6d349331510ffe6d7936b4537d60b6ccf26"; }); # END - # # REGION AUTO UPDATE: { name="neko_git"; type="git"; url=""; } - # src = sourceFromHead "neko_git-3abfb2f6d68cc301f9795e10c75734e293b4cfa9.tar.gz" - # (throw "source not not published yet: neko_git"); - # # END - # optionally remove apache mysql like gentoo does? # they just remove libs/{apache,mod_neko} buildInputs = [boehmgc pkgconfig makeWrapper] ++ libs; @@ -47,8 +43,8 @@ composableDerivation {} ( fixed : { description = "Neko is an high-level dynamicly typed programming language"; homepage = http://nekovm.org; license = ["GPLv2" ]; # -> docs/license.txt - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; # if stripping was done neko and nekoc would be the same. ?! diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index a6e462753da..92098dc369a 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -1,31 +1,40 @@ -args: with args; +{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 +, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto +, libffi, libffcall, coreutils }: + stdenv.mkDerivation rec { v = "2.48"; name = "clisp-${v}"; - src = - fetchurl { - url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; - sha256 = "1hix1j7zhbn37ld46d6pi6agwxski893l1zwriwkd8jr11b3zf05"; - }; + + src = fetchurl { + url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; + sha256 = "1hix1j7zhbn37ld46d6pi6agwxski893l1zwriwkd8jr11b3zf05"; + }; inherit libsigsegv gettext coreutils; - buildInputs = [libsigsegv gettext ncurses readline libX11 libXau - libXt pcre zlib libXpm xproto libXext xextproto libffi - libffcall]; + + buildInputs = + [ libsigsegv gettext ncurses readline libX11 libXau + libXt pcre zlib libXpm xproto libXext xextproto libffi + libffcall + ]; # First, replace port 9090 (rather low, can be used) # with 64237 (much higher, IANA private area, not # anything rememberable). patchPhase = '' - sed -e 's@9090@64237@g' -i tests/socket.tst - sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in - find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i + sed -e 's@9090@64237@g' -i tests/socket.tst + sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in + find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i ''; - configureFlags = "--with-readline builddir --with-dynamic-ffi - --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc - --with-module=pcre --with-module=rawsock --with-module=readline - --with-module=syscalls --with-module=wildcard --with-module=zlib"; + configureFlags = + '' + --with-readline builddir --with-dynamic-ffi + --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc + --with-module=pcre --with-module=rawsock --with-module=readline + --with-module=syscalls --with-module=wildcard --with-module=zlib + ''; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d @@ -38,10 +47,10 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "ANSI Common Lisp Implementation"; - homepage = http://clisp.cons.org; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "ANSI Common Lisp Implementation"; + homepage = http://clisp.cons.org; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 35154e9f945..89cf52f7e5e 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: stdenv.mkDerivation rec { pname = "SDL_image"; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index d53d011faba..6c76dafd572 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, mesa, x11, libXmu, libXi }: stdenv.mkDerivation { name = "glew-1.5.2"; @@ -8,13 +8,13 @@ stdenv.mkDerivation { sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8"; }; - buildInputs = [mesa x11 libXmu libXi]; + buildInputs = [ mesa x11 libXmu libXi ]; + installPhase = "GLEW_DEST=\$out make install"; + meta = { - description = "cross-platform open-source C/C++ extension loading library"; + description = "Cross-platform open-source C/C++ extension loading library"; homepage = http://glew.sourceforge.net/; license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 }; - - installPhase="GLEW_DEST=\$out make install"; } diff --git a/pkgs/development/libraries/glefw/default.nix b/pkgs/development/libraries/glfw/default.nix index bf4d0f504de..1454d2ec94a 100644 --- a/pkgs/development/libraries/glefw/default.nix +++ b/pkgs/development/libraries/glfw/default.nix @@ -1,27 +1,27 @@ -args: with args; +{ stdenv, fetchurl, mesa, libX11, libXext }: stdenv.mkDerivation { - name = "glefw-2.6"; + name = "glfw-2.6"; src = fetchurl { url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2; sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv"; }; - buildInputs = [mesa libX11 libXext]; + buildInputs = [ mesa libX11 libXext ]; buildPhase = '' ensureDir $out make x11-install PREFIX=$out ''; - installPhase=":"; + installPhase = ":"; meta = { - description = "multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; + description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = http://glfw.sourceforge.net/; license = "zlib/libpng"; # http://www.opensource.org/licenses/zlib-license.php - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 4bec18e7eca..45442072d39 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,17 +1,18 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, gtk, cairo, glib, pkgconfig }: + +stdenv.mkDerivation { name = "goocanvas-0.10"; - src = args.fetchurl { + src = fetchurl { url = mirror://sourceforge/goocanvas/goocanvas-0.10.tar.gz; sha256 = "0b49szbr3n7vpavly9w17ipa8q3ydicdcd177vxbdvbsnvg7aqp9"; }; - buildInputs =(with args; [gtk cairo glib pkgconfig]); + buildInputs = [ gtk cairo glib pkgconfig ]; meta = { - description = "canvas widget for GTK+ using the cairo 2D library"; - homepage = http://goocanvas.sourceforge.net/; - license = ["GPL" "LGPL"]; + description = "Canvas widget for GTK+ based on the the Cairo 2D library"; + homepage = http://goocanvas.sourceforge.net/; + license = ["GPL" "LGPL"]; }; } diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index cd77b5d6293..8df52cf2a27 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, e2fsprogs }: stdenv.mkDerivation { name = "gupnp-0.12"; @@ -8,10 +8,5 @@ stdenv.mkDerivation { sha256 = "1sm1rqvx752nb3j1yl7h30kx2ymndkji8m73fxshjssmc6z40ayg"; }; - buildInputs = [ - pkgconfig glib libxml2 gssdp libsoup e2fsprogs - #dbus.libs dbus_glib gtk glib - ]; - - #configureFlags=""; + buildInputs = [ pkgconfig glib libxml2 gssdp libsoup e2fsprogs ]; } diff --git a/pkgs/development/libraries/lesstif-0.93/default.nix b/pkgs/development/libraries/lesstif-0.93/default.nix index 3e452cf81c4..e8ec3d5e659 100644 --- a/pkgs/development/libraries/lesstif-0.93/default.nix +++ b/pkgs/development/libraries/lesstif-0.93/default.nix @@ -1,23 +1,25 @@ -args: with args ; - +{ stdenv, fetchurl, x11, libXp, libXau }: stdenv.mkDerivation { name = "lesstif-0.93.94"; + src = fetchurl { url = http://prdownloads.sourceforge.net/lesstif/lesstif-0.93.94.tar.bz2; sha256 = "0v4l46ill6dhhswsw1hk6rqyng98d85nsr214vhd2k0mfajpig1y"; }; + buildInputs = [x11]; + propagatedBuildInputs = [libXp libXau]; # This is an older release of lesstif which works with arb. - # - patches = [ - ./c-bad_integer_cast.patch - ./c-xim_chained_list_crash.patch - ./c-render_table_crash.patch - ./stdint.patch + patches = + [ ./c-bad_integer_cast.patch + ./c-xim_chained_list_crash.patch + ./c-render_table_crash.patch + ./stdint.patch ]; + meta = { priority = "5"; }; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index ade3626918c..78487a9f323 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,9 +1,12 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }: + stdenv.mkDerivation { name = "libwpd-0.8.14"; + src = fetchurl { url = mirror://sourceforge/libwpd/libwpd-0.8.14.tar.gz; sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01"; }; - buildInputs = [pkgconfig glib libgsf libxml2 bzip2]; + + buildInputs = [ pkgconfig glib libgsf libxml2 bzip2 ]; } diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index e36df1da7b6..e8c3775a94b 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2 +, libICE, glib, libxkbfile, isocodes }: stdenv.mkDerivation rec { name = "libxklavier-4.0"; @@ -8,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71"; }; -# TODO: enable xmodmap support, needs xmodmap DB - propagatedBuildInputs = [libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes]; + # TODO: enable xmodmap support, needs xmodmap DB + propagatedBuildInputs = [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - buildInputs = [pkgconfig]; + buildInputs = [ pkgconfig ]; configureFlags = '' --with-xkb-base=${xkeyboard_config}/etc/X11/xkb diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix index 4adbe69f697..0dc156ca3b7 100644 --- a/pkgs/games/micropolis/default.nix +++ b/pkgs/games/micropolis/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, libX11, libXpm, libXext, xextproto, byacc }: + stdenv.mkDerivation { name = "micropolis"; @@ -7,24 +8,25 @@ stdenv.mkDerivation { sha256 = "1b3c72dc3680a34b5fc5a740a6fb5cfc0b8775514da8ab7bb3b2965b20d4f8bc"; }; - patches = [ - (fetchurl { - url = http://rmdir.de/~michael/micropolis_git.patch; - sha256 = "13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592"; - }) - ]; + patches = + [ (fetchurl { + url = http://rmdir.de/~michael/micropolis_git.patch; + sha256 = "13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592"; + }) + ]; buildInputs = [ libX11 libXpm libXext xextproto byacc ]; - preConfigure = [ - ''cd src + preConfigure = + '' + cd src sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm}/include/X11@" tk/makefile sed -i "s@^INCLUDES.*\$@&\n\t-I$PWD/tcl \\\\@" sim/makefile - '' - ]; + ''; - postInstall = [ - ''mkdir -p $out/bin + postInstall = + '' + mkdir -p $out/bin mkdir -p $out/usr/share/games/micropolis cd .. for d in activity cities images manual res; do @@ -32,17 +34,16 @@ stdenv.mkDerivation { done cp Micropolis $out/usr/share/games/micropolis cat > $out/bin/micropolis << EOF -#!/bin/bash -cd $out/usr/share/games/micropolis -./Micropolis -EOF + #!/bin/bash + cd $out/usr/share/games/micropolis + ./Micropolis + EOF chmod 755 $out/bin/micropolis - '' - ]; + ''; meta = { - description = "GPL'ed version of S*m C*ty"; - homepage = http://www.donhopkins.com/home/micropolis/; - license = "GPL"; + description = "GPL'ed version of S*m C*ty"; + homepage = http://www.donhopkins.com/home/micropolis/; + license = "GPL"; }; } diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 54f70f48979..5433c0018a5 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango +, gettext, zlib, boost, freetype, libpng, pkgconfig }: stdenv.mkDerivation rec { pname = "wesnoth"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mrhgwp8iw27ifpavnf4y69zf9fqfy7j4sfwkfzsay226sp4gw3y"; }; - buildInputs = [SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost freetype libpng pkgconfig]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost freetype libpng pkgconfig ]; configureFlags = "--with-preferences-dir=.${name} --program-suffix=-${version} --with-datadir-name=${name} --with-boost=${boost}/include --disable-python"; diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index 3996d9b08ef..d6b73ed16fe 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -1,5 +1,6 @@ -args: with args; -stdenv.mkDerivation (rec { +{ stdenv, fetchurl, libX11, libXext, libXt, xextproto, xproto }: + +stdenv.mkDerivation rec { pname = "xosd"; version = "2.2.12"; @@ -10,9 +11,9 @@ stdenv.mkDerivation (rec { sha256 = "7d4ae8e1a6dbd7743af3b1cdc85144e2de26abe6daec25f4bd74bf311774df08"; }; - buildInputs = [libX11 libXext libXt xextproto xproto]; + buildInputs = [ libX11 libXext libXt xextproto xproto ]; meta = { description = "XOSD displays text on your screen"; }; -}) +} diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index 2c28e986afb..0bc33bcb7fa 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, xorgserver }: # !!! What does this package do, and does it belong in Nixpkgs? diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index c0e3b9ac2f9..1b18138f28b 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, libX11, libXtst, xextproto, libXi, inputproto }: stdenv.mkDerivation { name = "xmacro-0.3pre20000911"; @@ -8,9 +8,9 @@ stdenv.mkDerivation { md5 = "d2956b82f3d5380e58a75ccc721fb746"; }; - preBuild=" sed -e 's/-pedantic//g' -i Makefile "; + preBuild = " sed -e 's/-pedantic//g' -i Makefile "; - preInstall="echo -e 'install:\n mkdir \${out}/bin;\n cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; "; + preInstall = "echo -e 'install:\n mkdir \${out}/bin;\n cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; "; - buildInputs = [libX11 libXtst xextproto libXi inputproto]; + buildInputs = [ libX11 libXtst xextproto libXi inputproto ]; } diff --git a/pkgs/tools/graphics/gifscile/default.nix b/pkgs/tools/graphics/gifscile/default.nix deleted file mode 100644 index 31f7a4e4527..00000000000 --- a/pkgs/tools/graphics/gifscile/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -args: -args.stdenv.mkDerivation { - name = "gifsicle-1.52"; - - src = args.fetchurl { - url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz; - sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk"; - }; - - buildInputs =(with args; [xproto libXt libX11]); - - meta = { - description = "command-line tool for creating, editing, and getting information about GIF images and animations"; - homepage = http://www.lcdf.org/gifsicle/; - license = "GPL2"; - }; -} diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix new file mode 100644 index 00000000000..515858bd439 --- /dev/null +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, xproto, libXt, libX11 }: + +stdenv.mkDerivation { + name = "gifsicle-1.52"; + + src = fetchurl { + url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz; + sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk"; + }; + + buildInputs = [ xproto libXt libX11 ]; + + meta = { + description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; + homepage = http://www.lcdf.org/gifsicle/; + license = "GPL2"; + }; +} diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 003169415d3..105cccea3d9 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -15,15 +15,16 @@ stdenv.mkDerivation { name = "gnuplot-4.4.0"; + src = fetchurl { url = "mirror://sourceforge/gnuplot/gnuplot-4.4.0.tar.gz"; sha256 = "0akb2lzxa3b0j4nr6anr0mhsk10b1fcnixk8vk9aa82rl1a2rph0"; }; - configureFlags = if (libX11 != null) then ["--with-x"] else ["--without-x"]; + configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; - buildInputs = [ - zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw - wxGTK pango cairo pkgconfig - ]; + buildInputs = + [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw + wxGTK pango cairo pkgconfig + ]; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index df805c10698..5cc8d54f393 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,4 +1,6 @@ -args: with args; +{ stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid +, pkgconfig, gtkmm, gnomedocutils, libxml2 }: + stdenv.mkDerivation { name = "gparted-0.5.1"; @@ -9,12 +11,14 @@ stdenv.mkDerivation { configureFlags = "--disable-doc"; - buildInputs = [parted gtk glib intltool gettext libuuid pkgconfig - gtkmm gnomedocutils libxml2]; + buildInputs = + [ parted gtk glib intltool gettext libuuid pkgconfig gtkmm + gnomedocutils libxml2 + ]; meta = { - description = "gui partition tool"; - homepage = http://gparted.sourceforge.net; - license = "GPLv2"; + description = "Graphical disk partitioning tool"; + homepage = http://gparted.sourceforge.net; + license = "GPLv2"; }; } diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index e751b9aa177..ae9fed67117 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, x11, libXmu }: + stdenv.mkDerivation { name = "xclip-0.11"; @@ -7,11 +8,11 @@ stdenv.mkDerivation { sha256 = "0ipwxkfqz66fz6jlln1v46sd2kr6bkqzq6j5hkzn6pb3grmzsacg"; }; - buildInputs = [x11 libXmu]; + buildInputs = [ x11 libXmu ]; meta = { - description = "access X clipboard from this console application"; - homepage = http://people.debian.org/~kims/xclip/; - license = "GPL-2"; + description = "Tool to access the X clipboard from a console application"; + homepage = http://people.debian.org/~kims/xclip/; + license = "GPL-2"; }; } diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index 852e6a25e90..e6b5cd9daab 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, gtk, readline, ncurses, gettext, openssl, pkgconfig }: + stdenv.mkDerivation { name = "gftp-2.0.19"; @@ -10,8 +11,8 @@ stdenv.mkDerivation { buildInputs = [ gtk readline ncurses gettext openssl pkgconfig ]; meta = { - description = "GTK based FTP client"; - homepage = http://www.gftp.org; - license = "GPLv2+"; + description = "GTK+-based FTP client"; + homepage = http://www.gftp.org; + license = "GPLv2+"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d02609897ee..4a6a8fd224c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -223,13 +223,6 @@ let inherit stdenv perl; }; - debPackage = { - debBuild = lib.sumTwoArgs(import ../build-support/deb-package) { - inherit builderDefs; - }; - inherit fetchurl stdenv; - }; - dotnetenv = import ../build-support/dotnetenv { inherit stdenv; dotnetfx = dotnetfx35; @@ -815,12 +808,12 @@ let }; gftp = import ../tools/networking/gftp { - inherit lib fetchurl stdenv; + inherit fetchurl stdenv; inherit readline ncurses gettext openssl pkgconfig; - inherit (gtkLibs) glib gtk; + inherit (gtkLibs) gtk; }; - gifsicle = import ../tools/graphics/gifscile { + gifsicle = import ../tools/graphics/gifsicle { inherit fetchurl stdenv; inherit (xlibs) xproto libXt libX11; }; @@ -871,6 +864,8 @@ let inherit (xlibs) libX11 libXt libXaw libXpm; inherit (gtkLibs) pango; inherit cairo pkgconfig; + texLive = null; + lua = null; }; gnused = useFromStdenv "gnused" @@ -2602,7 +2597,7 @@ let }; neko = import ../development/compilers/neko { - inherit sourceFromHead fetchurl stdenv lib pkgconfig composableDerivation + inherit sourceFromHead fetchurl lib pkgconfig composableDerivation boehmgc apacheHttpd mysql zlib sqlite pcre apr makeWrapper; inherit (gtkLibs) gtk; }; @@ -4000,13 +3995,13 @@ let }; glew = import ../development/libraries/glew { - inherit fetchurl stdenv mesa x11 libtool; + inherit fetchurl stdenv mesa x11; inherit (xlibs) libXmu libXi; }; - glefw = import ../development/libraries/glefw { - inherit fetchurl stdenv lib mesa; - inherit (xlibs) libX11 libXext xextproto; + glfw = import ../development/libraries/glfw { + inherit fetchurl stdenv mesa; + inherit (xlibs) libX11 libXext; }; glibc = useFromStdenv "glibc" glibc211; @@ -6594,7 +6589,7 @@ let inherit kernel; - ati_drivers_x11 = import ../os-specific/linux/ati-drivers { + ati_drivers_x11 = import ../os-specific/linux/ati-drivers { inherit stdenv fetchurl kernel xlibs which mesa xorg makeWrapper patchelf glibc; inherit (xorg) imake libXxf86vm xf86vidmodeproto; @@ -7330,7 +7325,7 @@ let }; unifont = import ../data/fonts/unifont { - inherit debPackage perl; + inherit fetchurl stdenv; inherit (xorg) mkfontdir mkfontscale bdftopcf fontutil; }; @@ -7403,7 +7398,7 @@ let }; ardour = import ../applications/audio/ardour { - inherit fetchurl stdenv lib pkgconfig scons boost redland librdf_raptor + inherit fetchurl stdenv pkgconfig scons boost librdf_raptor librdf_rasqal jackaudio flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx libusb cairomm librdf liblo fftw fftwSinglePrec aubio libmad; @@ -7947,7 +7942,7 @@ let }; grip = import ../applications/misc/grip { - inherit fetchurl stdenv lib grip pkgconfig curl cdparanoia libid3tag; + inherit fetchurl stdenv pkgconfig curl cdparanoia libid3tag; inherit (gtkLibs) gtk glib; inherit (gnome) libgnome libgnomeui vte; }; @@ -8281,6 +8276,8 @@ let inherit stdenv fetchurl bzip2 freetype graphviz ghostscript libjpeg libpng libtiff libxml2 zlib libtool jasper; inherit (xlibs) libX11; + tetex = null; + librsvg = null; }; imagemagickBig = import ../applications/graphics/ImageMagick { @@ -8303,7 +8300,7 @@ let inkscape = import ../applications/graphics/inkscape { inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib popt libxml2 libxslt libpng boehmgc libsigcxx lcms boost gettext - cairomm python pyxml makeWrapper intltool gsl; + python pyxml makeWrapper intltool gsl; inherit (pythonPackages) lxml; inherit (gtkLibs) gtk glib glibmm gtkmm; inherit (xlibs) libXft; @@ -8331,7 +8328,7 @@ let }; jigdo = import ../applications/misc/jigdo { - inherit fetchurl stdenv db45 libwpd bzip2; + inherit fetchurl stdenv db45 bzip2; inherit (gtkLibs) gtk; }; @@ -8518,9 +8515,8 @@ let }; mrxvt = import ../applications/misc/mrxvt { - inherit lib fetchurl stdenv freetype pkgconfig which; - inherit (xlibs) libXaw xproto libXt libX11 libSM libICE libXft - libXi inputproto; + inherit fetchurl stdenv freetype pkgconfig which; + inherit (xlibs) libX11 libSM libICE libXft libXi inputproto; }; multisync = import ../applications/misc/multisync { @@ -8753,7 +8749,7 @@ let }; rxvt = import ../applications/misc/rxvt { - inherit lib fetchurl stdenv; + inherit fetchurl stdenv; inherit (xlibs) libXt libX11; }; @@ -9200,8 +9196,7 @@ let }; xterm = import ../applications/misc/xterm { - inherit fetchurl stdenv ncurses freetype pkgconfig; - inherit (xlibs) libXaw xproto libXt libX11 libSM libICE libXext libXft luit; + inherit fetchurl stdenv ncurses freetype pkgconfig xorg; }; xtrace = import ../tools/X11/xtrace { @@ -9389,9 +9384,9 @@ let }; micropolis = import ../games/micropolis { - inherit lib fetchurl stdenv; + inherit fetchurl stdenv; inherit (xlibs) libX11 libXpm libXext xextproto; - inherit byacc bash; + inherit byacc; }; openttd = import ../games/openttd { |