nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 19:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only set font in wrapper if we have X.

Browse Source 
Unison's wrapper was generating errors by calling xset even if DISPLAY
was not set.  This was especially noticeable when connecting to a
remote server to sync with.

Fix this by only setting the font path if DISPLAY is set to something.

svn path=/nixpkgs/trunk/; revision=21821
This commit is contained in:
Peter Simons 2010-05-17 16:16:48 +00:00
parent cbc19490b9
commit c29e6c97f1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ stdenv.mkDerivation (rec {
postInstall = ''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--run "${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
'';