From 749b8607ca3a6621d1aa37384c85e72369c64741 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 28 Jul 2010 15:35:01 +0000 Subject: * More cleanup. svn path=/nixpkgs/trunk/; revision=22795 --- pkgs/applications/misc/d4x/default.nix | 12 +++++++----- pkgs/applications/misc/grip/default.nix | 9 +++++---- pkgs/applications/misc/jigdo/default.nix | 16 ++++++++-------- pkgs/applications/misc/mrxvt/default.nix | 17 +++++++++-------- pkgs/applications/misc/multisync/default.nix | 14 +++++++++----- pkgs/applications/misc/qcad/default.nix | 12 +++++++----- pkgs/applications/misc/rxvt/default.nix | 9 +++++---- pkgs/applications/misc/synergy/default.nix | 26 +++++++++++++++----------- pkgs/applications/misc/xterm/default.nix | 20 ++++++++++++++------ 9 files changed, 79 insertions(+), 56 deletions(-) (limited to 'pkgs/applications/misc') diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index f4ad3cc8421a..4eb4c441c99d 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 a82715fc13cd..6b08069054c8 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 69ec74337df6..6ceca2ea871f 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 e7d83fd828ed..b11b234eb43d 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 af6bc072e53d..8fd043539698 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 00d4fe99ba3b..798f9eeec205 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 58366c6aa048..13597f3ee9bc 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 f8c494cb8ed2..cb79bf592fe4 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 9f6a8a59e720..55d6a9c16b02 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 -- cgit 1.4.1