* layout changes
svn path=/nixpkgs/trunk/; revision=11981
This commit is contained in:
parent
d025d67118
commit
2991f9adef
@ -1,15 +1,18 @@
|
|||||||
{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper}:
|
{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation (rec {
|
||||||
|
|
||||||
name = "unison-2.13.16";
|
name = "unison-2.13.16";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://www.seas.upenn.edu/~bcpierce/unison//download/releases/stable/unison-2.13.16.tar.gz;
|
url = "http://www.seas.upenn.edu/~bcpierce/unison//download/releases/stable/${name}.tar.gz";
|
||||||
sha256 = "808400a933aeb67654edc770822cd186d1b2adc92e7cb5836996c71c69ffe656";
|
sha256 = "808400a933aeb67654edc770822cd186d1b2adc92e7cb5836996c71c69ffe656";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ocaml makeWrapper];
|
buildInputs = [ocaml makeWrapper];
|
||||||
|
|
||||||
preBuild = "sed -i \"s|\\(OCAMLOPT=.*\\)$|\\1 -I ${lablgtk}/lib/ocaml/lablgtk2|\" Makefile.OCaml";
|
preBuild = ''
|
||||||
|
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I ${lablgtk}/lib/ocaml/lablgtk2|" Makefile.OCaml
|
||||||
|
'';
|
||||||
makeFlags = "UISTYLE=gtk2 INSTALLDIR=$(out)/bin/";
|
makeFlags = "UISTYLE=gtk2 INSTALLDIR=$(out)/bin/";
|
||||||
preInstall = "ensureDir $out/bin";
|
preInstall = "ensureDir $out/bin";
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
@ -18,4 +21,5 @@ stdenv.mkDerivation {
|
|||||||
--run "${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\""
|
--run "${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\""
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
}
|
|
||||||
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user