* More cleanup.

svn path=/nixpkgs/trunk/; revision=22798
This commit is contained in:
Eelco Dolstra
2010-07-28 18:01:17 +00:00
parent d67aefc19d
commit f1598a8941
32 changed files with 425 additions and 498 deletions
+12 -9
View File
@@ -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/;
};
+23 -32
View File
@@ -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";
};
}
+11 -20
View File
@@ -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 ];
+2 -2
View File
@@ -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";