* add unison

- unison uses a wrapper script to add font-schumacher-misc to the local X font path
    if the font isn't already present; this is necessary for it to work, but not terribly
    nice ...
* lablgtk is a dependency of unison
  - handling of library dirs with ocaml is a hack so far; in principle, ocaml needs
    a general setup for library dirs like ghc

svn path=/nixpkgs/trunk/; revision=9094
This commit is contained in:
Andres Löh 2007-08-10 08:21:31 +00:00
parent eb6d79c872
commit 3d519c2bed
3 changed files with 51 additions and 0 deletions

View File

@ -0,0 +1,27 @@
{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper}:
stdenv.mkDerivation {
name = "unison-2.13.16";
src = fetchurl {
url = http://www.seas.upenn.edu/~bcpierce/unison//download/releases/stable/unison-2.13.16.tar.gz;
sha256 = "808400a933aeb67654edc770822cd186d1b2adc92e7cb5836996c71c69ffe656";
};
buildInputs = [ocaml];
addInputsHook = "source $makeWrapper";
preBuild = "sed -i \"s|\\(OCAMLOPT=.*\\)$|\\1 -I $lablgtk/lib/ocaml/lablgtk2|\" Makefile.OCaml";
makeFlags = "UISTYLE=gtk2 INSTALLDIR=$(out)/bin/";
preInstall = "ensureDir $out/bin";
postInstall = [
"for i in $(cd $out/bin && ls); do"
" mv $out/bin/$i $out/bin/.orig-$i;"
" echo \"#! $SHELL -e\" > $out/bin/$i;"
" echo \"$xset/bin/xset q | grep -q \\\"$fontschumachermisc\\\" || $xset/bin/xset +fp \\\"$fontschumachermisc/lib/X11/fonts/misc\\\"\" >> $out/bin/$i;"
" echo \"exec \\\"$out/bin/.orig-$i\\\" \\\"\\\$@\\\"\" >> $out/bin/$i;"
" chmod +x $out/bin/$i;"
"done"
];
inherit lablgtk fontschumachermisc xset makeWrapper;
}

View File

@ -0,0 +1,14 @@
{stdenv, fetchurl, ocaml, pkgconfig, gtk}:
stdenv.mkDerivation {
name = "lablgtk-2.6.0";
src = fetchurl {
url = http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz;
sha256 = "3694bc1e288ce0903af6c96a2790d2340ba38fa51b18090062ede75137d97876";
};
buildInputs = [ocaml pkgconfig gtk];
configureFlags = "--with-libdir=$(out)/lib/ocaml";
buildFlags = "world";
}

View File

@ -1506,6 +1506,11 @@ rec {
inherit fetchurl stdenv x11 libjpeg libtiff libungif libpng;
};
lablgtk = import ../development/libraries/lablgtk {
inherit fetchurl stdenv ocaml pkgconfig;
inherit (gtkLibs) gtk;
};
lcms = import ../development/libraries/lcms {
inherit fetchurl stdenv;
};
@ -3312,6 +3317,11 @@ rec {
#enableOfficialBranding = true;
};
unison = import ../applications/networking/sync/unison {
inherit fetchurl stdenv ocaml lablgtk makeWrapper;
inherit (xorg) xset fontschumachermisc;
};
valknut = import ../applications/networking/p2p/valknut {
inherit fetchurl stdenv perl x11 libxml2 libjpeg libpng openssl dclib;
qt = qt3;