Author: viric
Date: Mon Jan 3 18:43:16 2011
New Revision: 25369
URL: https://svn.nixos.org/websvn/nix/?rev=25369&sc=1
Log:
Allowing unison without X.
Modified:
nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix Mon Jan
3 18:36:31 2011 (r25368)
+++ nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix Mon Jan
3 18:43:16 2011 (r25369)
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper}:
+{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper
+, enableX11 ? true}:
stdenv.mkDerivation (rec {
@@ -10,17 +11,20 @@
buildInputs = [ocaml makeWrapper];
- preBuild = ''
+ preBuild = if enableX11 then ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo
"${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml
- '';
- makeFlags = "UISTYLE=gtk2 INSTALLDIR=$(out)/bin/";
+ '' else "";
+
+ makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then "UISTYLE=gtk2"
else "");
+
preInstall = "ensureDir $out/bin";
- postInstall = ''
+
+ postInstall = if enableX11 then ''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q
\"${fontschumachermisc}\" || ${xset}/bin/xset +fp
\"${fontschumachermisc}/lib/X11/fonts/misc\")"
done
- '';
+ '' else "";
meta = {
homepage = http://www.cis.upenn.edu/~bcpierce/unison/;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Jan 3 18:36:31
2011 (r25368)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Jan 3 18:43:16
2011 (r25369)
@@ -6576,6 +6576,7 @@
unison = callPackage ../applications/networking/sync/unison {
inherit (ocamlPackages) lablgtk;
+ enableX11 = getConfig [ "unison" "enableX11" ] true;
};
uucp = callPackage ../tools/misc/uucp { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
