summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2008-11-20 17:22:42 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2008-11-20 17:22:42 +0000
commit6bbff48079b27b529f0359bb9e6731dba1ad71db (patch)
treeb8a5e3794f90eb97c62f8b872aadba2594780ed1
parentb8eb32f4d22e42d7c17a7da7aed4cb864eee8902 (diff)
downloadguix-6bbff48079b27b529f0359bb9e6731dba1ad71db.tar.gz
-rw-r--r--scripts/nix-profile.sh.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
index 6442e3efb1..0c1e1bb80f 100644
--- a/scripts/nix-profile.sh.in
+++ b/scripts/nix-profile.sh.in
@@ -7,5 +7,12 @@ if test -n "$HOME"; then
         @coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
     fi
 
-    export PATH=$NIX_LINK/bin:@prefix@/bin:$PATH
+    export PATH=$NIX_LINK/bin:$PATH
+fi
+
+# This is a quick hack to make fontconfig-based packages in Nixpkgs
+# work out of the box on non-NixOS systems.  Of course, we should
+# really fix fontconfig...
+if test -z "$FONTCONFIG_FILE" -a -e /etc/fonts/fonts.conf; then
+    export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 fi