diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 17174fbebbf8..94e1e72d0f55 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -1,27 +1,22 @@
-args: with args;
- let localDefs = builderDefs.passthru.function {
- src =
- fetchurl {
- url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
- sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh";
- };
- buildInputs = [fftw ladspaH pkgconfig];
- configureFlags = [];
- };
- in with localDefs;
-let
- postInstall = fullDepEntry ("
- ensureDir \$out/share/ladspa/
- ln -s \$out/lib/ladspa \$out/share/ladspa/lib
- ") [minInit defEnsureDir];
-in
+{ stdenv, fetchurl, fftw, ladspaH, pkgconfig }:
+
stdenv.mkDerivation {
- name = "swh-plugins-0.4.15";
- builder = writeScript "swh-plugins-0.4.15-builder"
- (textClosure localDefs [doConfigure doMakeInstall
- postInstall doForceShare]);
- meta = {
- description = "LADSPA format audio plugins";
- inherit src;
- };
+ name = "swh-plugins-0.4.15";
+
+ src = fetchurl {
+ url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
+ sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh";
+ };
+
+ buildInputs = [fftw ladspaH pkgconfig];
+
+ postInstall =
+ ''
+ ensureDir $out/share/ladspa/
+ ln -s $out/lib/ladspa $out/share/ladspa/lib
+ '';
+
+ meta = {
+ description = "LADSPA format audio plugins";
+ };
}
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 828fdc0bdde6..dbe32f862f26 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,20 +1,20 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, qt4, alsaLib, jackaudio }:
+
+stdenv.mkDerivation {
+ name = "qjackctl-0.3.3";
# some dependencies such as killall have to be installed additionally
- name = "qjackctl-0.3.3";
-
- src = args.fetchurl {
+ src = fetchurl {
url = http://downloads.sourceforge.net/qjackctl/qjackctl-0.3.3.tar.gz;
sha256 = "1z9v208fs79ka6ni3p5v5xb0k5y1wqqm2a9cf903387b9p3fhpxj";
};
- buildInputs =(with args; [qt4 alsaLib jackaudio]);
+ buildInputs = [ qt4 alsaLib jackaudio ];
meta = {
- description = "qt jackd control gui tool";
- homepage = http://qjackctl.sourceforge.net/;
- license = "GPL";
+ description = "qt jackd control gui tool";
+ homepage = http://qjackctl.sourceforge.net/;
+ license = "GPL";
};
}
diff --git a/pkgs/applications/audio/sonic-visualizer/default.nix b/pkgs/applications/audio/sonic-visualizer/default.nix
index 08b300b1c115..6e40baa1c360 100644
--- a/pkgs/applications/audio/sonic-visualizer/default.nix
+++ b/pkgs/applications/audio/sonic-visualizer/default.nix
@@ -1,11 +1,10 @@
# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
-args: with args;
+{ stdenv, fetchurl, libsndfile, qt, fftw, librdf, rubberband
+, libsamplerate, vampSDK, alsaLib, librdf_raptor, librdf_rasqal
+, redland, jackaudio, pulseaudio, libmad, libogg, liblo, bzip2 }:
stdenv.mkDerivation {
-
-#TODO add plugins!
-
name = "sonic-visualizer-1.6";
src = fetchurl {
@@ -13,16 +12,17 @@ stdenv.mkDerivation {
sha256 = "1dbqqa7anii2jnjpfwm4sr83nn4bwmz68xw4n6clycsz5iqk52f5";
};
- buildInputs = [libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
- libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
- # optional
- jackaudio
- # portaudio
- pulseaudio
- libmad
- libogg # ?
- # fishsound
- liblo
+ buildInputs =
+ [ libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
+ libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
+ # optional
+ jackaudio
+ # portaudio
+ pulseaudio
+ libmad
+ libogg # ?
+ # fishsound
+ liblo
];
buildPhase = ''
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
description = "View and analyse contents of music audio files";
homepage = http://www.sonicvisualiser.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/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index 6a8b3d6499bd..65c86a6cf97a 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -1,8 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, fltk, openexr, mesa, which, openexr_ctl }:
assert fltk.glSupport;
-stdenv.mkDerivation {
+stdenv.mkDerivation {
name ="openexr_viewers-1.0.1";
src = fetchurl {
@@ -10,18 +10,18 @@ stdenv.mkDerivation {
sha256 = "1w5qbcdp7sw48z1wk2v07f7p14vqqb1m2ncxyxnbkm9f4ab0ymg6";
};
- inherit fltk mesa;
+ configurePhase =
+ ''
+ # don't know why.. adding these flags it works
+ #export CXXFLAGS=`fltk-config --use-gl --cxxflags --ldflags`
+ ./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config
+ '';
- configurePhase = "
- # don't know why.. adding these flags it works
- #export CXXFLAGS=`fltk-config --use-gl --cxxflags --ldflags`
- ./configure --prefix=\$out --with-fltk-config=\$fltk/bin/fltk-config";
-
- buildInputs = [openexr fltk pkgconfig mesa which openexr_ctl];
+ buildInputs = [ openexr fltk pkgconfig mesa which openexr_ctl ];
meta = {
- description = "tool to view OpenEXR images";
- homepage = http://openexr.com;
- license = "BSD-like";
+ description = "Tool to view OpenEXR images";
+ homepage = http://openexr.com;
+ license = "BSD-like";
};
}
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index f0e5f6ab0780..dd6f205eca88 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }:
+
stdenv.mkDerivation {
name = "freemind-0.9.0_RC_6";
@@ -7,43 +8,44 @@ stdenv.mkDerivation {
sha256 = "0qxpwqmb4xd8c83zh76gczmx0hsx5m209k7p60kh7c4f25snhngf";
};
- buildInputs = [jdk ant];
+ buildInputs = [ jdk ant ];
- phases="unpackPhase patchPhase buildPhase installPhase";
+ phases = "unpackPhase patchPhase buildPhase installPhase";
- patchPhase=''
+ patchPhase = ''
# There is a complain about this. I don't understand it.
mkdir plugins/plugins
'';
buildPhase="ant dist";
-# LIBXCB_ALLOW_SLOPPY_LOCK=true :
-# don't know yet what this option really means but I'm no longer getting
-# Checking Java Version...
-# Locking assertion failure. Backtrace:
-# java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed
-# this way
-# reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
-# JDK 7 beta seems to have fixed this (bug ?)
+
+ # LIBXCB_ALLOW_SLOPPY_LOCK=true :
+ # don't know yet what this option really means but I'm no longer getting
+ # Checking Java Version...
+ # Locking assertion failure. Backtrace:
+ # java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed
+ # this way
+ # reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
+ # JDK 7 beta seems to have fixed this (bug ?)
- installPhase=''
+ installPhase = ''
ensureDir $out/{bin,nix-support}
cp -r ../bin/dist $out/nix-support
sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh
cat > $out/bin/freemind << EOF
#!/bin/sh
- export PATH=${args.coreutils}/bin:${args.gnugrep}/bin:"$PATH"
+ export PATH=${coreutils}/bin:${gnugrep}/bin:"$PATH"
export JAVA_HOME="${jre}"
export LIBXCB_ALLOW_SLOPPY_LOCK=true
$out/nix-support/dist/freemind.sh
EOF
chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh}
- '';
+ '';
meta = {
- description = "mind mapping software";
- homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page;
- license = "GPL";
+ description = "Mind-mapping software";
+ homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page;
+ license = "GPL";
};
}
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 74eead5e782c..029d8675ddf6 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,11 +1,11 @@
-args: with args;
-# args.perlSupport: enables perl interpreter support
-# see man urxvtperl for details
+{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl }:
+
let
name = "rxvt-unicode";
version = "9.07";
n = "${name}-${version}";
in
+
stdenv.mkDerivation (rec {
name = "${n}${if perlSupport then "-with-perl" else ""}";
@@ -15,26 +15,25 @@ stdenv.mkDerivation (rec {
sha256 = "18y5mb3cm1gawjm723q5r7yk37s9drzg39kna036i694m2667865";
};
- buildInputs = [ libX11 libXt libXft ncurses /* required to build the terminfo file */ ]
- ++ lib.optional perlSupport perl;
+ buildInputs =
+ [ libX11 libXt libXft ncurses /* required to build the terminfo file */ ]
+ ++ stdenv.lib.optional perlSupport perl;
- preConfigure=''
- configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
- export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
- ''
- # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
- + (if perlSupport then ''
+ preConfigure =
+ ''
+ configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
+ export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
+ ''
+ # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
+ + stdenv.lib.optionalString perlSupport ''
ensureDir $out/lib/perl5
ln -s $out/{lib/urxvt,lib/perl5/site_perl}
- '' else "");
-
- postInstall = ''
- '';
+ '';
meta = {
- description = "rxvt-unicode is a clone of the well known terminal emulator rxvt.";
+ description = "A clone of the well-known terminal emulator rxvt";
longDescription = "
- you should put this into your .bashrc
+ You should put this into your ~/.bashrc:
export TERMINFO=~/.nix-profile/share/terminfo
";
homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix
index b4279bccbe5c..af942529d32f 100644
--- a/pkgs/applications/misc/xneur/0.8.nix
+++ b/pkgs/applications/misc/xneur/0.8.nix
@@ -1,26 +1,28 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, pcre, GStreamer, glib, libxml2, aspell
+, imlib2, xorg, xosd }:
stdenv.mkDerivation {
name = "xneur-0.8.0";
+
src = fetchurl {
url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2;
sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8";
};
- buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell
- libXpm imlib2 xosd libXt libXext];
-
- inherit aspell imlib2 xosd;
+ buildInputs =
+ [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell
+ xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext
+ ];
preConfigure = ''
sed -e 's/-Werror//' -i configure
- sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure
- sed -e 's/for imlib2_dir in/for imlib2_dir in $imlib2 /' -i configure
- sed -e 's/for xosd_dir in/for xosd_dir in $xosd /' -i configure
+ sed -e 's/for aspell_dir in/for aspell_dir in ${aspell} /' -i configure
+ sed -e 's/for imlib2_dir in/for imlib2_dir in ${imlib2} /' -i configure
+ sed -e 's/for xosd_dir in/for xosd_dir in ${xosd} /' -i configure
'';
meta = {
- description = "xneur is the keyboard layout switcher.";
+ description = "Utility for switching between keyboard layouts";
};
}
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 5a4bdefdea5a..e341ae6cd055 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2
+, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk }:
let s = import ./src-for-default.nix; in
@@ -9,17 +10,17 @@ stdenv.mkDerivation rec {
sha256 = s.hash;
};
- buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell
- libXpm imlib2 xosd libXt libXext libXi libnotify gtk pango
- cairo];
-
- inherit aspell imlib2 xosd;
+ buildInputs =
+ [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo
+ xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
+ gtk pango
+ ];
preConfigure = ''
sed -e 's/-Werror//' -i configure
- sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure
- sed -e 's/for imlib2_dir in/for imlib2_dir in $imlib2 /' -i configure
- sed -e 's/for xosd_dir in/for xosd_dir in $xosd /' -i configure
+ sed -e 's/for aspell_dir in/for aspell_dir in ${aspell} /' -i configure
+ sed -e 's/for imlib2_dir in/for imlib2_dir in ${imlib2} /' -i configure
+ sed -e 's/for xosd_dir in/for xosd_dir in ${xosd} /' -i configure
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
@@ -31,11 +32,10 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "xneur is the keyboard layout switcher.";
+ description = "Utility for switching between keyboard layouts";
homepage = http://xneur.ru;
license = "GPL2+";
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
};
-
}
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 4f793b04fc85..2994ca190652 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,9 +1,8 @@
-args: with args;
+{ composableDerivation, fetchurl, lib, qt, openssl, autoconf, automake, pkgconfig }:
-let inherit (args.composableDerivation) composableDerivation edf wwf; in
-
-composableDerivation {} ( fixed : {
+let inherit (composableDerivation) edf wwf; in
+composableDerivation.composableDerivation {} ( fixed : {
name = "yate2";
src = fetchurl {
@@ -12,28 +11,29 @@ composableDerivation {} ( fixed : {
};
# TODO zaptel ? postgres ?
- buildInputs = [qt openssl autoconf automake pkgconfig];
+ buildInputs = [ qt openssl autoconf automake pkgconfig ];
# /dev/null is used when linking which is a impure path for the wrapper
- preConfigure = "
-
- sed -i 's@,/dev/null@@' configure
- ";
+ preConfigure =
+ ''
+ sed -i 's@,/dev/null@@' configure
+ '';
# --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?
- preBuild = ''
- export NIX_LDFLAGS="-L$TMP/yate $NIX_LDFLAGS"
- find . -type f -iname Makefile | xargs sed -i \
- -e 's@-Wl,--unresolved-symbols=ignore-in-shared-libs@@' \
- -e 's@-Wl,--retain-symbols-file@@'
- '';
+ preBuild =
+ ''
+ export NIX_LDFLAGS="-L$TMP/yate $NIX_LDFLAGS"
+ find . -type f -iname Makefile | xargs sed -i \
+ -e 's@-Wl,--unresolved-symbols=ignore-in-shared-libs@@' \
+ -e 's@-Wl,--retain-symbols-file@@'
+ '';
meta = {
description = "YATE - Yet Another Telephony Engine";
homepage = http://yate.null.ro/;
license = ["GPL" "MPL"]; # Yate's license is GPL with an exception for linking with OpenH323 and PWlib (licensed under MPL).
- maintainers = [args.lib.maintainers.marcweber];
- platforms = args.lib.platforms.linux;
+ maintainers = [ lib.maintainers.marcweber ];
+ platforms = lib.platforms.linux;
};
} )
diff --git a/pkgs/applications/networking/twinkle/default.nix b/pkgs/applications/networking/twinkle/default.nix
index 04141a51984f..905f7efc43ab 100644
--- a/pkgs/applications/networking/twinkle/default.nix
+++ b/pkgs/applications/networking/twinkle/default.nix
@@ -1,4 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost
+, libsndfile, libxml2, libjpeg, readline, qt, perl, file
+, alsaLib, speex, libzrtpcpp, xorg }:
+
stdenv.mkDerivation {
name = "twinkle-1.4.2";
@@ -9,19 +12,18 @@ stdenv.mkDerivation {
configureFlags = "--with-extra-includes=${libjpeg}/include";
- buildInputs = [pkgconfig commoncpp2 ccrtp openssl boost libsndfile
- libxml2 libjpeg readline qt libjpeg perl file
- # optional ? :
- alsaLib
- speex libzrtpcpp libX11 libXaw libICE libXext
+ buildInputs =
+ [ pkgconfig commoncpp2 ccrtp openssl boost libsndfile
+ libxml2 libjpeg readline qt perl file
+ # optional ? :
+ alsaLib
+ speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
];
-
meta = {
- description = "softphone for your voice over IP";
homepage = http://www.xs4all.nl/~mfnboer/twinkle/index.html;
license = "GPL";
- 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/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index 93f8fd79fb1e..8123f8717a8e 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
+, libart_lgpl, qt, python, cups, fontconfig, libjpeg
+, zlib, libpng, xorg, cairo, cmake }:
assert stdenv.gcc.gcc != null;
@@ -8,13 +10,9 @@ assert stdenv.gcc.gcc != null;
# will be released with the next version of scribus - So don't miss them
# when upgrading this package
-#let useCairo = true;
-let useCairo = false;
-
-in
+let useCairo = false; in
stdenv.mkDerivation {
-
name = "scribus-1.3.3.14";
src = fetchurl {
@@ -35,9 +33,9 @@ stdenv.mkDerivation {
buildInputs =
[ pkgconfig /*<- required fro cairo only?*/ cmake freetype lcms libtiff libxml2 libart_lgpl qt
python cups fontconfig
- libXaw libXext libX11 libXtst libXi libXinerama
- libjpeg libtiff zlib libpng
- ] ++ lib.optional useCairo cairo;
+ xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama
+ libjpeg zlib libpng
+ ] ++ stdenv.lib.optional useCairo cairo;
# fix rpath which is removed by cmake..
postFixup = ''
@@ -49,9 +47,9 @@ stdenv.mkDerivation {
'';
meta = {
- maintainers = [lib.maintainers.marcweber];
- platforms = lib.platforms.linux;
- description = "Desktop Publishing (DTP) and Layout program for Linux.";
+ maintainers = [ stdenv.lib.maintainers.marcweber ];
+ platforms = stdenv.lib.platforms.linux;
+ description = "Desktop Publishing (DTP) and Layout program for Linux";
homepage = http://www.scribus.net;
license = "GPLv2";
};
diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix
index 4a732e7750cc..4543fce48160 100644
--- a/pkgs/applications/science/biology/arb/default.nix
+++ b/pkgs/applications/science/biology/arb/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, glew, mesa, libpng, lesstif, lynx, freeglut
+, libtiff, rxp, sablotron, perl, jdk, transfig, gv, gnuplot, xorg }:
# NOTE: This package does not build on 64-bit systems. Because of some faulty
# int->pointer arithmatic. The build scripts are abnormal - but it appears to
@@ -6,6 +7,7 @@ args: with args;
stdenv.mkDerivation {
name = "arb-2007-Dec-07";
+
src = fetchurl {
url = http://download.arb-home.de/release/2007_12_07/arbsrc.tgz;
sha256 = "04l7qj0wigg1h56a9d70hxhdr343v3dg5dhqrc7fahc1v4h8f1rd";
@@ -13,7 +15,11 @@ stdenv.mkDerivation {
patches = [ ./makefile.patch ];
- buildInputs = [ glew mesa libpng libXpm lesstif lynx freeglut libtiff rxp sablotron libXaw perl jdk transfig libX11 libXext libXt gv gnuplot ];
+ buildInputs =
+ [ glew mesa libpng xorg.libXpm lesstif lynx freeglut libtiff rxp
+ sablotron xorg.libXaw perl jdk transfig xorg.libX11 xorg.libXext
+ xorg.libXt gv gnuplot
+ ];
unpackPhase = ''
tar xzf $src
@@ -49,20 +55,22 @@ stdenv.mkDerivation {
chmod a+rwx $shareddir/lib/pixmaps
# bulk copy
cp -vau * $out
+
# replace arb script
mv $out/bin/arb $out/bin/arb.orig
cat > $out/bin/arb << ARB
-#!/bin/sh
+ #!/bin/sh
-echo Starting Nix compiled arb from $out
-echo Shared databases are located in $shareddir
-# sometimes local profiles override these:
-export ARBHOME=$out
-export LD_LIBRARY=$ARBHOME/lib
+ echo Starting Nix compiled arb from $out
+ echo Shared databases are located in $shareddir
+ # sometimes local profiles override these:
+ export ARBHOME=$out
+ export LD_LIBRARY=$ARBHOME/lib
-$out/bin/arb_ntree $*
+ $out/bin/arb_ntree $*
-ARB
+ ARB
+
chmod +x $out/bin/arb
'';
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 7d8b2dca2721..58a84d91b83e 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -1,6 +1,11 @@
-args:
-with args;
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, sourceFromHead, autoconf, automake, libtool
+, pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
+, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
+, libtiff, freetype, mjpegtools, x264, gettext, openexr, esound
+, libXxf86vm, libXv, libXi, libX11, xextproto, libtheora, libpng
+, libdv, nasm, perl, e2fsprogs }:
+
+stdenv.mkDerivation {
name = "cinelerra-git";
# REGION AUTO UPDATE: { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; }
@@ -8,35 +13,33 @@ args.stdenv.mkDerivation {
(fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; });
# END
- perl = args.perl;
-
# touch confi.rpath: work around bug in automake 1.10 ?
preConfigure = ''
- find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@$perl/bin/perl@" -i
+ find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i
touch config.rpath
./autogen.sh
- '';
- configureOptions = ["--enable-freetype2"];
+ '';
+
+ configureFlags = [ "--enable-freetype2" ];
- buildInputs =(with args; [
- automake
+ buildInputs =
+ [ automake
autoconf libtool pkgconfig
faad2 faac
a52dec alsaLib fftw lame libavc1394 libiec61883
libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
mjpegtools x264 gettext openexr esound
- #
libXxf86vm libXv libXi libX11 xextproto
libtheora libpng libdv
nasm
perl
e2fsprogs
- ]);
+ ];
meta = {
- description = "Cinelerra - Video Editor";
- homepage = http://www.cinelerra.org;
- maintainers = [lib.maintainers.marcweber];
- license = "GPLv2";
+ description = "Cinelerra - Video Editor";
+ homepage = http://www.cinelerra.org;
+ maintainers = [ stdenv.lib.maintainers.marcweber ];
+ license = "GPLv2";
};
}
diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix
index 7b0c36740022..3b881558aeda 100644
--- a/pkgs/development/interpreters/clisp/2.44.1.nix
+++ b/pkgs/development/interpreters/clisp/2.44.1.nix
@@ -1,31 +1,36 @@
-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.44.1";
name = "clisp-${v}";
- src =
- fetchurl {
- url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
- sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
- };
+
+ src = fetchurl {
+ url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
+ sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
+ };
- 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,9 +43,9 @@ stdenv.mkDerivation rec {
doCheck = 1;
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/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index 1fb1cda33539..6b6cb2ba8790 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -1,17 +1,19 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} rec {
+{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
+, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} rec {
name = "fltk-2.0.x-r6970";
- src = args.fetchurl {
+ src = fetchurl {
url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2";
sha256 = "0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3";
};
- propagatedBuildInputs=[x11 inputproto libXi freeglut];
+ propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
- buildInputs = [ args.pkgconfig ];
+ buildInputs = [ pkgconfig ];
flags =
# this could be tidied up (?).. eg why does it require freeglut without glSupport?
@@ -28,18 +30,19 @@ composableDerivation {} rec {
// edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } # turn on Xinerama support default=no
// edf { name = "xft"; enable = { buildInputs=[libXft]; }; } # turn on Xft support default=no
// edf { name = "xdbe"; }; # turn on Xdbe support default=no
+
cfg = {
- largefileSupport = true; # is default
- glSupport = true; # doesn't build without it. Why?
- localjpegSupport = false;
- localzlibSupport = false;
- localpngSupport = false;
- sharedSupport = true;
- threadsSupport = true;
+ largefileSupport = true; # is default
+ glSupport = true; # doesn't build without it. Why?
+ localjpegSupport = false;
+ localzlibSupport = false;
+ localpngSupport = false;
+ sharedSupport = true;
+ threadsSupport = true;
};
meta = {
- description = "a C++ cross platform lightweight gui library binding";
- homepage = http://www.fltk.org;
+ description = "a C++ cross platform lightweight gui library binding";
+ homepage = http://www.fltk.org;
};
}
diff --git a/pkgs/development/libraries/fltk/fltk11.nix b/pkgs/development/libraries/fltk/fltk11.nix
index 41733862c172..118b24ec317f 100644
--- a/pkgs/development/libraries/fltk/fltk11.nix
+++ b/pkgs/development/libraries/fltk/fltk11.nix
@@ -1,17 +1,19 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
+, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
name = "fltk-1.1.10";
- src = args.fetchurl {
+ src = fetchurl {
url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2;
sha256 = "16mic69a48y3ybijml754x38djxxb25rn8441p9qsssqy8ms5b9p";
};
- propagatedBuildInputs=[x11 inputproto libXi freeglut];
+ propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
- buildInputs = [ args.pkgconfig ];
+ buildInputs = [ pkgconfig ];
flags =
# this could be tidied up (?).. eg why does it require freeglut without glSupport?
@@ -28,18 +30,19 @@ composableDerivation {} {
// edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } # turn on Xinerama support default=no
// edf { name = "xft"; enable = { buildInputs=[libXft]; }; } # turn on Xft support default=no
// edf { name = "xdbe"; }; # turn on Xdbe support default=no
+
cfg = {
- largefileSupport = true; # is default
- glSupport = true; # doesn't build without it. Why?
- localjpegSupport = false;
- localzlibSupport = false;
- localpngSupport = false;
- sharedSupport = true;
- threadsSupport = true;
+ largefileSupport = true; # is default
+ glSupport = true; # doesn't build without it. Why?
+ localjpegSupport = false;
+ localzlibSupport = false;
+ localpngSupport = false;
+ sharedSupport = true;
+ threadsSupport = true;
};
meta = {
- description = "a C++ cross platform lightweight gui library binding";
- homepage = http://www.fltk.org;
+ description = "A C++ cross-platform light-weight GUI library binding";
+ homepage = http://www.fltk.org;
};
}
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index cbb0c23e3117..734bde71338c 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,8 +1,8 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, fetchurl, python }:
- buildInputs = [ "which" ]; # which is needed for the autogen.sh
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
flags =
# python and ruby untested
@@ -13,8 +13,8 @@ composableDerivation {} {
name = "geos-3.2.2";
src = fetchurl {
- url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2;
- sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4";
+ url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2;
+ sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4";
};
# for development version. can be removed ?
@@ -26,10 +26,8 @@ composableDerivation {} {
#";
meta = {
- description = "C++ port of the Java Topology Suite (JTS)"
- + "- all the OpenGIS \"Simple Features for SQL\" spatial predicate functions and spatial operators,"
- + " as well as specific JTS topology functions such as IsValid";
- homepage = http://geos.refractions.net/;
- license = "GPL";
+ description = "C++ port of the Java Topology Suite (JTS)";
+ homepage = http://geos.refractions.net/;
+ license = "GPL";
};
}
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index de4672ceb5ec..386b92f26847 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,16 +1,18 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, zlib, ctl, ilmbase }:
-stdenv.mkDerivation {
- inherit version;
- name = "openexr-${version}";
+stdenv.mkDerivation rec {
+ name = "openexr-1.6.1";
+
src = fetchurl {
- url = "http://download.savannah.nongnu.org/releases/openexr/openexr-${version}.tar.gz";
- sha256 = if (version == "1.6.1") then "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6"
- else if (version == "1.4.0") then "1y3dxakpg9651dgbj2xp6r4044b5gi74g23w3sr5cs6xi7cywv7m"
- else abort "not supported version";
+ url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
+ sha256 = "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6";
};
- buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl));
- propagatedBuildInputs = [pkgconfig zlib ilmbase];
+
+ buildInputs = [ pkgconfig ctl ];
+
+ propagatedBuildInputs = [ zlib ilmbase ];
+
configureFlags = "--enable-imfexamples";
+
patches = [ ./stringh.patch ];
}
diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix
index 288067a4bf25..1b15fdb6c9ed 100644
--- a/pkgs/development/libraries/openexr_ctl/default.nix
+++ b/pkgs/development/libraries/openexr_ctl/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, openexr, ilmbase, ctl }:
+
stdenv.mkDerivation {
name = "openexr_ctl-1.0.1";
@@ -7,18 +8,14 @@ stdenv.mkDerivation {
sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
};
- propagatedBuildInputs = [ilmbase];
- buildInputs = [openexr ctl];
- configureFlags="--with-ilmbase-prefix=${ilmbase}";
- #configurePhase = "
- #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
- #echo $CXXFLAGS
- #unset configurePhase; configurePhase
- #";
+ propagatedBuildInputs = [ ilmbase ];
+
+ buildInputs = [ openexr ctl ];
+
+ configureFlags = "--with-ilmbase-prefix=${ilmbase}";
meta = {
- description = "Color Transformation Language";
- homepage = http://ampasctl.sourceforge.net;
- license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
+ description = "Color Transformation Language";
+ homepage = http://ampasctl.sourceforge.net;
};
}
diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix
index 40e158660995..90031c92fe48 100644
--- a/pkgs/development/libraries/rubberband/default.nix
+++ b/pkgs/development/libraries/rubberband/default.nix
@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw
+, vampSDK, ladspaH }:
+
stdenv.mkDerivation {
name = "rubberband-1.3";
@@ -7,13 +9,13 @@ stdenv.mkDerivation {
sha256 = "0g1bihjzagp9mx9zppjyd9566dfdqh38a1ghwsd7c245hv2syri8";
};
- buildInputs = [pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH];
+ buildInputs = [ pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH ];
meta = {
- description = "high quality software library for audio time-stretching and pitch-shifting";
+ description = "High quality software library for audio time-stretching and pitch-shifting";
homepage = http://www.breakfastquay.com/rubberband/index.html;
license = ["GPL"]; # commercial license availible as well, see homepage. You'll get some more optimized routines
- 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/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
index ef1482d7a540..06063db491e9 100644
--- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
+++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
@@ -1,18 +1,19 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, writeTextFile, coreutils, gnumake, gcc, gnutar, bzip2, gnugrep, gnused, gawk }:
+
+stdenv.mkDerivation {
name = "avr-gcc-libc";
- srcBinutils = args.fetchurl {
+ srcBinutils = fetchurl {
url = ftp://ftp.gnu.org/gnu/binutils/binutils-2.17.tar.bz2;
sha256 = "0pm20n2l9ddgdpgzk3zhnbb8nbyb4rb2kvcw21pkd6iwybk3rhz2";
};
- srcGCC = args.fetchurl {
+ srcGCC = fetchurl {
url = ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-core-4.1.2.tar.bz2;
sha256 = "07binc1hqlr0g387zrg5sp57i12yzd5ja2lgjb83bbh0h3gwbsbv";
};
- srcAVRLibc = args.fetchurl {
+ srcAVRLibc = fetchurl {
url = http://www.very-clever.com/download/nongnu/avr-libc/avr-libc-1.4.5.tar.bz2;
sha256 = "058iv3vs6syy01pfkd5894xap9zakjx8ki1bpjdnihn6vk6fr80l";
};
@@ -20,12 +21,12 @@ args.stdenv.mkDerivation {
phases = "doAll";
# don't call any wired $buildInputs/nix-support/* scripts or such. This makes the build fail
- builder = args.writeTextFile {
+ builder = writeTextFile {
name = "avrbinutilsgccavrlibc-builder-script";
text = ''
- PATH=${args.coreutils}/bin:${args.gnumake}/bin:${args.gcc}/bin:${args.gnutar}/bin:${args.bzip2}/bin:${args.gnugrep}/bin:${args.gnused}/bin:${args.gawk}/bin
+ PATH=${coreutils}/bin:${gnumake}/bin:${gcc}/bin:${gnutar}/bin:${bzip2}/bin:${gnugrep}/bin:${gnused}/bin:${gawk}/bin
# that's all a bit too hacky...!
- for i in `cat ${args.gcc}/nix-support/propagated-user-env-packages`; do
+ for i in `cat ${gcc}/nix-support/propagated-user-env-packages`; do
echo adding $i
PATH=$PATH:$i/bin
done
diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix
index a5d7ea84ebff..0a7a12a6e171 100644
--- a/pkgs/development/tools/selenium/remote-control/default.nix
+++ b/pkgs/development/tools/selenium/remote-control/default.nix
@@ -1,6 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, jre }:
+
# let version = "1.0-beta-2";
let version = "1.0-SNAPSHOT-standalone";
+
in stdenv.mkDerivation {
/*
diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix
deleted file mode 100644
index 837685db2d9f..000000000000
--- a/pkgs/games/fsg/alt-builder.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-args: with args;
- let localDefs = builderDefs.passthru.function {
- buildInputs =[mesa wxGTK libX11 xproto];
- src =
- fetchurl {
- url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
- sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
- };
- };
- in with localDefs;
-let
- preBuild = fullDepEntry "
- sed -e '
- s@currentProbIndex != 100@0@;
- ' -i MainFrame.cpp;
- " [minInit];
-
- installPhase = fullDepEntry "
- ensureDir \$out/bin \$out/libexec;
- cp sand \$out/libexec;
- echo -e '#! /bin/sh\nLC_ALL=C '\$out'/libexec/sand \"$@\"' >\$out/bin/fsg;
- chmod a+x \$out/bin/fsg;
- " [minInit defEnsureDir];
-in
-stdenv.mkDerivation {
- name = "fsg-4.4";
- builder = writeScript "fsg-4.4-builder"
- (textClosure localDefs [doUnpack addInputs preBuild doMake installPhase doForceShare]);
-
- meta = {
- description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand";
- inherit src;
- };
-}
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index 029c93d6690e..2752e565c58c 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, pkgconfig, mesa, wxGTK, libX11, xproto }:
stdenv.mkDerivation {
name = "fsg-4.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
};
- buildInputs = [gtk glib pkgconfig mesa wxGTK libX11 xproto];
+ buildInputs = [ gtk glib pkgconfig mesa wxGTK libX11 xproto ];
/*
# One day Unicode will overcome?
diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix
index 54418c1bc1ee..ad126b45daa4 100644
--- a/pkgs/misc/gxemul/default.nix
+++ b/pkgs/misc/gxemul/default.nix
@@ -1,13 +1,16 @@
-args: with args;
-let edf = composableDerivation.edf;
- name = "gxemul-0.4.6"; in
-composableDerivation.composableDerivation {} {
+{ composableDerivation, fetchurl }:
+let edf = composableDerivation.edf;
+ name = "gxemul-0.4.6";
+in
+
+composableDerivation.composableDerivation {} {
inherit name;
+
flags = {
- doc = { installPhase = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
- demos = { installPhase = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; };
- man = { installPhase = "cp -r ./man \$out/;";};
+ doc = { installPhase = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
+ demos = { installPhase = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; };
+ man = { installPhase = "cp -r ./man \$out/;";};
};
cfg = {
@@ -23,11 +26,11 @@ composableDerivation.composableDerivation {} {
sha256 = "0hf3gi6hfd2qr5090zimfiddcjgank2q6m7dfsr81wwpxfbhb2z3";
};
- configurePhase="./configure";
+ configurePhase = "./configure";
meta = {
license = "BSD";
- description = "A Machine Emulator, Mainly emulates MIPS, but supports other CPU type";
+ description = "A Machine Emulator, mainly emulates MIPS, but supports other CPU types";
homepage = http://gavare.se/gxemul/;
};
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 5a302adc60d5..f6eecdc787d3 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,9 +1,20 @@
# Perhaps we can get some ideas from here ? http://gentoo-wiki.com/HOWTO_Jack
# still much to test but it compiles now
-args:
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
- buildInputs = [ args.pkgconfig ];
+
+{ composableDerivation, fetchurl, pkgconfig, alsaLib }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
+ name = "jack-0.103.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/jackit/jack-audio-connection-kit-0.109.2.tar.gz";
+ sha256 = "1m5z8dzalqspsa63pkcgyns0cvh0kqwhb9g1ivcwvnz0bc7ag9r7";
+ };
+
+ buildInputs = [ pkgconfig ];
+
flags =
# FIXME: tidy up
edf { name = "posix-shm"; } #use POSIX shm API
@@ -15,43 +26,23 @@ composableDerivation {} {
// edf { name = "coreaudio"; } #ignore CoreAudio driver
// edf { name = "oss"; } #ignore OSS driver
// edf { name = "freebob"; } #ignore FreeBob driver
- // edf { name = "alsa"; enable = { buildInputs=[args.alsaLib]; }; };
+ // edf { name = "alsa"; enable = { buildInputs = [ alsaLib ]; }; };
- # altivec seems to be for mac only ?
- # altivec = { configureFlags = ["--enable-altivec"]; }; #enable Altivec support (default=auto)
-
- # keeping default values by now:
- # optimization_by_compiler = { configureFlags = ["--enable-optimization-by-compiler"]; }; [>use compiler (NOT processor) capabilities to determine optimization flags
- # optimization_by_cpu = { configureFlags = ["--enable-optimization-by-cpu"]; }; [>use processor capabilities to determine optimization flags
-
- # I think the default is ok
- # mmx = edf { name = "mmx"; }; #enable MMX support (default=auto)
- #sse = edf { name = "sse"; }; #enable SSE support (default=auto)
- #dynsimd = edf { name = "dynsimd"; }; #enable dynamic SIMD selection (default=no)
- #optimize = edf { name = "optimize"; }; #ask the compiler for its best optimizations
- #resize = edf { name = "resize"; }; #enable buffer resizing feature
- #ensure_mlock = edf { name = "ensure-mlock"; }; #fail if unable to lock memory
- #debug = edf { name = "debug"; }; #enable debugging messages in jackd and libjack
- #preemption_check = edf { name = "preemption-check"; }; #
cfg = {
posix_shmSupport = true;
timestampsSupport = true;
alsaSupport = true;
};
- name = "jack-0.103.0";
- src = args.fetchurl {
- url = "mirror://sourceforge/jackit/jack-audio-connection-kit-0.109.2.tar.gz";
- sha256 = "1m5z8dzalqspsa63pkcgyns0cvh0kqwhb9g1ivcwvnz0bc7ag9r7";
- };
- meta = {
- description = "jack audio connection kit";
- homepage = "http://jackaudio.org";
- license = "GPL";
- };
-
+
# make sure the jackaudio is found by symlinking lib64 to lib
postInstall = ''
ensureDir $out/lib
ln -s $out/lib{64,}/pkgconfig
'';
+
+ meta = {
+ description = "JACK audio connection kit";
+ homepage = "http://jackaudio.org";
+ license = "GPL";
+ };
}
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 76366d66f570..f30bf0a7e748 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -1,38 +1,29 @@
-# note: there is a jedit plugin
-args: with args;
+{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile
+, python, gettext, flex, perl, bison, pkgconfig, texLive
+, fontconfig, freetype, pango, fontforge, help2man }:
stdenv.mkDerivation {
name = "lilypond-2.13.9";
- /*
- # REGION AUTO UPDATE: { name="lilypond"; type = "git"; url = "git://git.sv.gnu.org/lilypond.git"; }
- src= sourceFromHead "lilypond-7d065cae414aac445a40c0c6646c3baf6f358cb3.tar.gz"
- (throw "source not not published yet: lilypond");
- # END
- #preConfigure = "./autogen.sh";
- */
-
src = fetchurl {
url = http://download.linuxaudio.org/lilypond/sources/v2.13/lilypond-2.13.9.tar.gz;
sha256 = "1x3jz0zbhly4rc07nry3ia3ydd6vislz81gg0ivwfm6f6q0ssk57";
};
configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"];
- # configureFlags = "--disable-documentation";
-
- buildInputs = [
- automake autoconf
- ghostscript texinfo imagemagick texi2html guile texinfo
- python gettext flex perl bison pkgconfig texLive fontconfig freetype pango
- fontforge help2man];
+ buildInputs =
+ [ ghostscript texinfo imagemagick texi2html guile
+ python gettext flex perl bison pkgconfig texLive fontconfig freetype pango
+ fontforge help2man
+ ];
meta = {
- description = "music typesetting system";
+ description = "Music typesetting system";
homepage = http://lilypond.org/;
license = "GPL";
- maintainers = [args.lib.maintainers.marcweber];
- platforms = args.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.marcweber ];
+ platforms = stdenv.lib.platforms.linux;
};
patches = [ ./findlib.patch ];
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
index 0b8a12799dda..63fb29a7eb35 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/misc/sane-backends/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, hotplugSupport ? false, libusb ? null,
- gt68xxFirmware ? null}:
+{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null
+, gt68xxFirmware ? null }:
assert hotplugSupport -> stdenv.system == "i686-linux";
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index 20f88acaed74..fd8abf7caf39 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,4 +1,4 @@
-args: with args; with kde;
+{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt, kde, perl }:
stdenv.mkDerivation {
name = "partitionmanager-1.0.0";
@@ -8,8 +8,8 @@ stdenv.mkDerivation {
sha256 = "03ibn4vns7pa0ygkp2jh6zcdy106as5cc7p6rv1f5c15wxx0zsk1";
};
- buildInputs = [cmake gettext parted libuuid
- qt kdelibs kdebase automoc4 perl phonon];
+ buildInputs =
+ [ cmake gettext parted libuuid qt kde.kdelibs kde.kdebase kde.automoc4 perl kde.phonon ];
preConfigure = ''
export VERBOSE=1
@@ -25,10 +25,9 @@ stdenv.mkDerivation {
'';
meta = {
- description = "utility program to help you manage the disk devices";
+ description = "Utility program to help you manage the disk devices";
homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ?
license = "GPL";
- #maintainers = [args.lib.maintainers.marcweber];
- platforms = args.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix
index dd4e8bbfd9ae..93231397feb5 100644
--- a/pkgs/tools/misc/w3c-css-validator/default.nix
+++ b/pkgs/tools/misc/w3c-css-validator/default.nix
@@ -1,11 +1,9 @@
-args: with args;
+{ stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }:
let
- inherit (args.stdenv) lib;
-
- sources = [
- (fetchurl {
+ sources =
+ [ (fetchurl {
name = "jigsaw_2.2.6.tar.gz";
url="http://jigsaw.w3.org/Distrib/jigsaw_2.2.6.tar.gz";
sha256 = "01cjpqjcs8gbvvzy0f488cb552f9b38hvwr97wydglrzndmcwypd";
@@ -20,7 +18,6 @@ let
url="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.4-bin.tar.gz";
sha256 = "0phwlgnvwj3n3j1aka2pkm0biacvgs72qc0ldir6s69i9qbv7rh0";
})
-
(fetchurl {
name = "velocity-1.6.1.tar.gz";
url="http://www.apache.org/dist/velocity/engine/1.6.1/velocity-1.6.1.tar.gz";
@@ -35,7 +32,7 @@ let
in
-stdenv.mkDerivation {
+stdenv.mkDerivation {
name = "w3c-css-validator";
# REGION AUTO UPDATE: { name="w3c-css-validator"; type="cvs"; cvsRoot=":pserver:anonymous:anonymous@dev.w3.org:/sources/public"; module="2002/css-validator"; }
@@ -43,14 +40,14 @@ stdenv.mkDerivation {
(fetchurl { url = "http://mawercer.de/~nix/repos/w3c-css-validator-F_17-52-37.tar.gz"; sha256 = "b6f05d4812eaa464906d101242689effa8b5516d32d6420315740a77d8ee11fd"; });
# END
- buildInputs = [apacheAnt];
+ buildInputs = [ apacheAnt ];
# prepare target downloads dependency .tar.gz into tmp
# note: There is a .war as well which could be deployed to tomcat
installPhase = ''
cd css-validator
mkdir tmp
- ${ lib.concatStringsSep "\n" (map (src: "tar xfz ${src} -C tmp") sources) }
+ ${ stdenv.lib.concatStringsSep "\n" (map (src: "tar xfz ${src} -C tmp") sources) }
sed -i -e 's@@@' \
-e '/dest="tmp\//d' \
-e '/untar/d' \
@@ -68,12 +65,12 @@ stdenv.mkDerivation {
'';
meta = {
- description = "w3c CSS validator";
- homepage = http://dev.w3.org/cvsweb/2002/css-validator/;
- # dependencies ship their own license files
- # I think all .java files are covered by this license (?)
- license = "w3c"; # http://www.w3.org/Consortium/Legal/
- maintainers = [args.lib.maintainers.marcweber];
- platforms = args.lib.platforms.linux;
+ description = "W3C CSS validator";
+ homepage = http://dev.w3.org/cvsweb/2002/css-validator/;
+ # dependencies ship their own license files
+ # I think all .java files are covered by this license (?)
+ license = "w3c"; # http://www.w3.org/Consortium/Legal/
+ maintainers = [ stdenv.lib.maintainers.marcweber ];
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/tools/networking/tcng/default.nix b/pkgs/tools/networking/tcng/default.nix
index e0f66df830d2..dd2082d30b24 100644
--- a/pkgs/tools/networking/tcng/default.nix
+++ b/pkgs/tools/networking/tcng/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, bison, flex, db4, perl, kernel, iproute }:
# tcc can even compile kernel modules for speed reason.
# that would be a nice use case to test!
@@ -10,7 +10,7 @@ args: with args;
let version = "10b"; in
-args.stdenv.mkDerivation {
+stdenv.mkDerivation {
name = "tcng-${version}";
@@ -19,13 +19,14 @@ args.stdenv.mkDerivation {
sha256 = "1xjs0yn90rfa8ibxybg3gab1xzcjg60njymq2bd1b0a9i0arx7ji";
};
- iproute2Src=iproute.src;
+ iproute2Src = iproute.src;
- patches = [
- (fetchurl {
- url = mirror://debian/pool/main/t/tcng/tcng_10b-2.diff.gz;
- sha256 = "17i4s2ffif0k4b78gfhkp08lvvharbfvyhwbd0vkwgpria0b9zrd";
- })];
+ patches =
+ [ (fetchurl {
+ url = mirror://debian/pool/main/t/tcng/tcng_10b-2.diff.gz;
+ sha256 = "17i4s2ffif0k4b78gfhkp08lvvharbfvyhwbd0vkwgpria0b9zrd";
+ })
+ ];
# one mailinglist post says you should just add your kernel version to the list.. (?)
patchPhase = ''
@@ -38,7 +39,6 @@ args.stdenv.mkDerivation {
find . -type f | xargs sed -i 's@/lib/cpp@cpp@g'
'';
-
# gentoo ebulid says tcsim doesn't compile with 2.6 headers..
# DATADIR can still be overridden by env TOPDIR=...
# Don't know whats it for except including the default .tc files
@@ -55,12 +55,11 @@ args.stdenv.mkDerivation {
--with-tcsim
'';
-
# hacky, how to enable building tcc the correct way?
# adding shared and tcc to SUBDIRS and run make again isn't nice but works
buildPhase = ''
sed -i 's@^\(SUBDIRS.*\)@\1 shared tcc@' Makefile
- make;
+ make
'';
# manually copy tcc and include files.. see comment above
@@ -71,16 +70,11 @@ args.stdenv.mkDerivation {
cp tcc/*.tc $out/lib/tcng/include
'';
- buildInputs =(with args; [bison flex db4 perl]);
+ buildInputs = [ bison flex db4 perl ];
meta = {
- description="tcng - Traffic Control Next Generation";
- homepage = "http://tcng.sourceforge.net/";
- license = "GPLv2";
- longDescription = ''
- useful links: http://linux-ip.net/articles/Traffic-Control-HOWTO,
- http://blog.edseek.com/~jasonb/articles/traffic_shaping/
- tcng language: http://linux-ip.net/gl/tcng/node9.html tcng language
- '';
+ description = "tcng - Traffic Control Next Generation";
+ homepage = "http://tcng.sourceforge.net/";
+ license = "GPLv2";
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c16b16ec309..e023c0ea3452 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1432,8 +1432,7 @@ let
};
pfstools = import ../tools/graphics/pfstools {
- inherit fetchurl stdenv imagemagick libjpeg libtiff mesa freeglut bzip2 libpng expat;
- openexr = openexr_1_6_1;
+ inherit fetchurl stdenv imagemagick libjpeg libtiff mesa freeglut bzip2 libpng expat openexr;
qt = qt3;
inherit (xlibs) libX11;
};
@@ -1897,7 +1896,7 @@ let
};
w3cCSSValidator = import ../tools/misc/w3c-css-validator {
- inherit fetchurl stdenv apacheAnt jre sourceFromHead lib;
+ inherit fetchurl stdenv apacheAnt jre sourceFromHead;
tomcat = tomcat6;
};
@@ -2683,9 +2682,9 @@ let
inherit stdenv fetchurl yacc flex glib pkgconfig;
};
- visualcpp = (import ../development/compilers/visual-c++ {
+ visualcpp = import ../development/compilers/visual-c++ {
inherit fetchurl stdenv cabextract;
- });
+ };
vs90wrapper = import ../development/compilers/vs90wrapper {
inherit stdenv;
@@ -3446,7 +3445,7 @@ let
# couldn't find the source yet
seleniumRCBin = import ../development/tools/selenium/remote-control {
- inherit fetchurl stdenv unzip;
+ inherit fetchurl stdenv;
jre = jdk;
};
@@ -3873,17 +3872,15 @@ let
};
fltk11 = (import ../development/libraries/fltk/fltk11.nix) {
- inherit composableDerivation x11 lib pkgconfig freeglut;
- inherit fetchurl stdenv mesa libpng libjpeg zlib ;
+ inherit composableDerivation x11 pkgconfig freeglut;
+ inherit fetchurl mesa libpng libjpeg zlib ;
inherit (xlibs) inputproto libXi libXinerama libXft;
- flags = [ "useNixLibs" "threads" "shared" "gl" ];
};
fltk20 = (import ../development/libraries/fltk) {
- inherit composableDerivation x11 lib pkgconfig freeglut;
- inherit fetchurl stdenv mesa libpng libjpeg zlib ;
+ inherit composableDerivation x11 pkgconfig freeglut;
+ inherit fetchurl mesa libpng libjpeg zlib;
inherit (xlibs) inputproto libXi libXinerama libXft;
- flags = [ "useNixLibs" "threads" "shared" "gl" ];
};
fmod = import ../development/libraries/fmod {
@@ -3948,8 +3945,7 @@ let
};
gegl = import ../development/libraries/gegl {
- inherit fetchurl stdenv libpng pkgconfig babl;
- openexr = openexr_1_6_1;
+ inherit fetchurl stdenv libpng pkgconfig babl openexr;
# avocodec avformat librsvg
inherit cairo libjpeg librsvg;
inherit (gtkLibs) pango glib gtk;
@@ -3964,9 +3960,7 @@ let
};
geos = import ../development/libraries/geos {
- inherit fetchurl fetchsvn stdenv autoconf
- automake libtool swig which lib composableDerivation python ruby;
- use_svn = stdenv.system == "x86_64-linux";
+ inherit composableDerivation fetchurl python;
};
gettext = import ../development/libraries/gettext {
@@ -5152,25 +5146,14 @@ let
# this ctl version is needed by openexr_viewers
openexr_ctl = import ../development/libraries/openexr_ctl {
- inherit fetchurl stdenv ilmbase ctl;
- openexr = openexr_1_6_1;
+ inherit fetchurl stdenv ilmbase ctl openexr;
};
- openexr_1_6_1 = import ../development/libraries/openexr {
- inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
- version = "1.6.1";
- # optional features:
+ openexr = import ../development/libraries/openexr {
+ inherit fetchurl stdenv ilmbase zlib pkgconfig;
inherit ctl;
};
- # This older version is needed by blender (it complains about missing half.h )
- openexr_1_4_0 = import ../development/libraries/openexr {
- inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
- version = "1.4.0";
- };
-
- openexr = openexr_1_6_1;
-
openldap = import ../development/libraries/openldap {
inherit fetchurl stdenv openssl cyrus_sasl db4 groff;
};
@@ -5367,7 +5350,7 @@ let
};
rubberband = import ../development/libraries/rubberband {
- inherit fetchurl stdenv lib pkgconfig libsamplerate libsndfile ladspaH;
+ inherit fetchurl stdenv pkgconfig libsamplerate libsndfile ladspaH;
fftw = fftwSinglePrec;
inherit (vamp) vampSDK;
};
@@ -6805,6 +6788,7 @@ let
inherit fetchgit stdenv autoconf texinfo;
automake = automake111x;
headersOnly = true;
+ mig = null;
};
mdadm = import ../os-specific/linux/mdadm {
@@ -7560,13 +7544,12 @@ let
chromeWrapper = wrapFirefox chrome "chrome" "";
cinelerra = import ../applications/video/cinelerra {
- inherit lib fetchurl sourceFromHead stdenv
+ inherit fetchurl sourceFromHead stdenv
automake autoconf libtool
a52dec alsaLib lame libavc1394 libiec61883 libraw1394 libsndfile
libvorbis libogg libjpeg libtiff freetype mjpegtools x264
gettext faad2 faac libtheora libpng libdv perl nasm e2fsprogs
- pkgconfig;
- openexr = openexr_1_6_1;
+ pkgconfig openexr;
fftw = fftwSinglePrec;
inherit (xorg) libXxf86vm libXv libXi libX11 xextproto;
inherit (gnome) esound;
@@ -7624,11 +7607,10 @@ let
cinepaint = import ../applications/graphics/cinepaint {
inherit stdenv fetchcvs cmake pkgconfig freetype fontconfig lcms flex libtiff
libjpeg libpng libexif zlib perl mesa perlXMLParser python pygtk gettext
- intltool babl gegl automake autoconf libtool;
+ intltool babl gegl automake autoconf libtool openexr;
inherit (xlibs) makedepend libX11 xf86vidmodeproto xineramaproto libXmu
libXext libXpm libXxf86vm;
inherit (gtkLibs) gtk glib;
- openexr = openexr_1_6_1;
fltk = fltk11;
};
@@ -7886,9 +7868,8 @@ let
};
exrdisplay = import ../applications/graphics/exrdisplay {
- inherit fetchurl stdenv pkgconfig mesa which openexr_ctl;
+ inherit fetchurl stdenv pkgconfig mesa which openexr_ctl openexr;
fltk = fltk20;
- openexr = openexr_1_6_1;
};
fbpanel = composedArgsAndFun (import ../applications/window-managers/fbpanel/4.12.nix) {
@@ -8198,10 +8179,9 @@ let
hugin = import ../applications/graphics/hugin {
inherit fetchurl cmake panotools libtiff libpng boost pkgconfig
exiv2 gettext ilmbase enblendenfuse autopanosiftc mesa freeglut
- glew;
+ glew openexr;
inherit wxGTK;
inherit (xlibs) libXi libXmu;
- openexr = openexr_1_6_1;
stdenv = stdenv2;
};
@@ -8348,7 +8328,7 @@ let
};
ladspaPlugins = import ../applications/audio/ladspa-plugins {
- inherit fetchurl stdenv builderDefs stringsWithDeps ladspaH pkgconfig;
+ inherit fetchurl stdenv ladspaH pkgconfig;
fftw = fftwSinglePrec;
};
@@ -8594,7 +8574,7 @@ let
};
partitionManager = import ../tools/misc/partition-manager {
- inherit fetchurl stdenv lib cmake pkgconfig gettext parted libuuid perl;
+ inherit fetchurl stdenv cmake gettext parted libuuid perl;
kde = kde44;
qt = qt4;
};
@@ -8677,8 +8657,7 @@ let
};
qtpfsgui = import ../applications/graphics/qtpfsgui {
- inherit fetchurl stdenv exiv2 libtiff fftw qt4 ilmbase;
- openexr = openexr_1_6_1;
+ inherit fetchurl stdenv exiv2 libtiff fftw qt4 ilmbase openexr;
};
rapidsvn = import ../applications/version-management/rapidsvn {
@@ -8707,12 +8686,12 @@ let
};
RealPlayer =
- (import ../applications/video/RealPlayer {
+ import ../applications/video/RealPlayer {
inherit fetchurl stdenv;
inherit (gtkLibs) glib pango atk gtk;
inherit (xlibs) libX11;
libstdcpp5 = gcc33.gcc;
- });
+ };
rekonq = makeOverridable (import ../applications/networking/browsers/rekonq) {
inherit fetchurl fetchgit stdenv cmake perl;
@@ -8733,7 +8712,7 @@ let
# = urxvt
rxvt_unicode = makeOverridable (import ../applications/misc/rxvt_unicode) {
- inherit lib fetchurl stdenv perl ncurses;
+ inherit fetchurl stdenv perl ncurses;
inherit (xlibs) libXt libX11 libXft;
perlSupport = false;
};
@@ -8750,11 +8729,9 @@ let
};
scribus = import ../applications/office/scribus {
- inherit fetchurl stdenv lib cmake pkgconfig freetype lcms libtiff libxml2
- cairo python cups fontconfig zlib libjpeg libpng;
+ inherit fetchurl stdenv cmake pkgconfig freetype lcms libtiff libxml2
+ cairo python cups fontconfig zlib libjpeg libpng xorg;
inherit (gnome) libart_lgpl;
- inherit (xlibs) libXau libXaw libXdmcp libXext libX11 libXtst libXi libXinerama libXrender;
- inherit (xorg) pixman libpthreadstubs;
qt = qt3;
};
@@ -8802,7 +8779,7 @@ let
};
sonicVisualizer = import ../applications/audio/sonic-visualizer {
- inherit fetchurl stdenv lib libsndfile libsamplerate bzip2 librdf
+ inherit fetchurl stdenv libsndfile libsamplerate bzip2 librdf
rubberband jackaudio pulseaudio libmad
libogg liblo alsaLib librdf_raptor librdf_rasqal redland fftw;
inherit (vamp) vampSDK;
@@ -8929,11 +8906,10 @@ let
};
twinkle = import ../applications/networking/twinkle {
- inherit fetchurl stdenv lib pkgconfig commoncpp2 ccrtp openssl speex libjpeg perl
- libzrtpcpp libsndfile libxml2 file readline alsaLib;
+ inherit fetchurl stdenv pkgconfig commoncpp2 ccrtp openssl speex libjpeg perl
+ libzrtpcpp libsndfile libxml2 file readline alsaLib xorg;
qt = qt3;
boost = boostFull;
- inherit (xlibs) libX11 libXaw libICE libXext;
};
unison = import ../applications/networking/sync/unison {
@@ -9131,16 +9107,14 @@ let
xneur = import ../applications/misc/xneur {
inherit fetchurl stdenv pkgconfig pcre libxml2 aspell imlib2
- xosd libnotify cairo;
+ xosd libnotify cairo xorg;
GStreamer=gst_all.gstreamer;
- inherit (xlibs) libX11 libXpm libXt libXext libXi;
inherit (gtkLibs) glib gtk pango atk;
};
xneur_0_8 = import ../applications/misc/xneur/0.8.nix {
- inherit fetchurl stdenv pkgconfig pcre libxml2 aspell imlib2 xosd glib;
+ inherit fetchurl stdenv pkgconfig pcre libxml2 aspell imlib2 xosd glib xorg;
GStreamer = gst_all.gstreamer;
- inherit (xlibs) libX11 libXpm libXt libXext;
};
xournal = import ../applications/graphics/xournal {
@@ -9213,8 +9187,8 @@ let
};
yate = import ../applications/misc/yate {
- inherit sox speex openssl automake autoconf pkgconfig;
- inherit fetchurl stdenv lib composableDerivation;
+ inherit openssl automake autoconf pkgconfig;
+ inherit fetchurl lib composableDerivation;
qt = qt4;
};
@@ -9318,13 +9292,6 @@ let
wxGTK = wxGTK28.override {unicode = false;};
};
- fsgAltBuild = import ../games/fsg/alt-builder.nix {
- inherit stdenv fetchurl mesa;
- wxGTK = wxGTK28.override {unicode = false;};
- inherit (xlibs) libX11 xproto;
- inherit stringsWithDeps builderDefs;
- };
-
gemrb = import ../games/gemrb {
inherit fetchurl stdenv SDL openal freealut zlib libpng python;
};
@@ -9588,7 +9555,7 @@ let
kde4 = kde44;
kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // {
- openexr = openexr_1_6_1;
+ inherit openexr;
stdenv = stdenv2;
});
@@ -9619,8 +9586,7 @@ let
};
arb = import ../applications/science/biology/arb {
- inherit fetchurl readline libpng zlib x11 lesstif93 freeglut perl;
- inherit (xlibs) libXpm libXaw libX11 libXext libXt;
+ inherit fetchurl libpng freeglut perl xorg;
inherit mesa glew libtiff lynx rxp sablotron jdk transfig gv gnuplot;
lesstif = lesstif93;
stdenv = overrideGCC stdenv gcc42;
@@ -9878,8 +9844,7 @@ let
}));
gxemul = (import ../misc/gxemul) {
- inherit lib stdenv fetchurl composableDerivation;
- inherit (xlibs) libX11;
+ inherit fetchurl composableDerivation;
};
hplip = import ../misc/drivers/hplip {
@@ -9890,8 +9855,7 @@ let
# using the new configuration style proposal which is unstable
jackaudio = import ../misc/jackaudio {
inherit composableDerivation
- ncurses lib stdenv fetchurl alsaLib pkgconfig;
- flags = [ "posix_shm" "timestamps" "alsa"];
+ fetchurl alsaLib pkgconfig;
};
keynav = import ../tools/X11/keynav {
@@ -9904,7 +9868,7 @@ let
};
lilypond = import ../misc/lilypond {
- inherit fetchurl sourceFromHead stdenv lib automake autoconf
+ inherit fetchurl stdenv
ghostscript texinfo imagemagick texi2html guile python gettext
perl bison pkgconfig texLive fontconfig freetype fontforge help2man;
inherit (gtkLibs) pango;