public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allowing unison without X. 

svn path=/nixpkgs/trunk/; revision=25369
This commit is contained in:
Lluís Batlle i Rossell 2011-01-03 18:43:16 +00:00
parent 9b50ebd825
commit ed9a70e40e
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/networking/sync/unison/default.nix
View File

@ -1,4 +1,5 @@
{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper}: {stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper
, enableX11 ? true}:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
@ -10,17 +11,20 @@ stdenv.mkDerivation (rec {
buildInputs = [ocaml makeWrapper]; buildInputs = [ocaml makeWrapper];
preBuild = '' preBuild = if enableX11 then ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml
''; '' else "";
makeFlags = "UISTYLE=gtk2 INSTALLDIR=$(out)/bin/";
makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then "UISTYLE=gtk2" else "");
preInstall = "ensureDir $out/bin"; preInstall = "ensureDir $out/bin";
postInstall = ''
postInstall = if enableX11 then ''
for i in $(cd $out/bin && ls); do for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \ wrapProgram $out/bin/$i \
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
done done
''; '' else "";
meta = { meta = {
homepage = http://www.cis.upenn.edu/~bcpierce/unison/; homepage = http://www.cis.upenn.edu/~bcpierce/unison/;

1
pkgs/top-level/all-packages.nix
View File

@ -6576,6 +6576,7 @@ let
unison = callPackage ../applications/networking/sync/unison { unison = callPackage ../applications/networking/sync/unison {
inherit (ocamlPackages) lablgtk; inherit (ocamlPackages) lablgtk;
enableX11 = getConfig [ "unison" "enableX11" ] true;
}; };
uucp = callPackage ../tools/misc/uucp { }; uucp = callPackage ../tools/misc/uucp { };