Merge branch 'master' into stdenv-updates.

2013-02-25 01:26:26 +01:00
parent cd5f4eefa6 7aad2ce101
commit 04b2efff19
3 changed files with 9 additions and 4 deletions
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -12,7 +12,7 @@
  }

  # Then you can install it by:  
-  #  $ nix-env -i sdl-env
+  #  $ nix-env -i env-sdl
  # And you can load it simply calling:  
  #  $ load-env-sdl
  # and this will update your env vars to have 'make' and 'gcc' finding the SDL