renamed load-sdl-env to load-env-sdl so that 'nix-env -i env-sdl' and 'load-env-sdl' have a common naming scheme

svn path=/nixpkgs/trunk/; revision=33421
This commit is contained in:
Joachim Schiele 2012-03-26 10:20:32 +00:00
parent ec5dda12d2
commit 9f73f39527

View File

@ -14,7 +14,7 @@
# Then you can install it by: # Then you can install it by:
# $ nix-env -i sdl-env # $ nix-env -i sdl-env
# And you can load it simply calling: # And you can load it simply calling:
# $ load-sdl-env # $ load-env-sdl
# and this will update your env vars to have 'make' and 'gcc' finding the SDL # and this will update your env vars to have 'make' and 'gcc' finding the SDL
# headers and libs. # headers and libs.
@ -49,8 +49,8 @@
# Now we should build our newly defined custom environment using this command on a shell, so type: # Now we should build our newly defined custom environment using this command on a shell, so type:
# $ nix-env -i env-nix # $ nix-env -i env-nix
# You can load the environment simply typing a "load-${name}-env" command. # You can load the environment simply typing a "load-env-${name}" command.
# $ load-nix-env # $ load-env-nix
# The result using that command should be: # The result using that command should be:
# env-nix loaded # env-nix loaded
and show you a shell with a prefixed prompt. and show you a shell with a prefixed prompt.
@ -129,7 +129,7 @@ mkDerivation {
mkdir -p $out/bin mkdir -p $out/bin
sed -e s,@shell@,${shell}, -e s,@myenvpath@,$out/dev-envs/${name}, \ sed -e s,@shell@,${shell}, -e s,@myenvpath@,$out/dev-envs/${name}, \
-e s,@name@,${name}, ${./loadenv.sh} > $out/bin/load-${name}-env -e s,@name@,${name}, ${./loadenv.sh} > $out/bin/load-env-${name}
chmod +x $out/bin/load-${name}-env chmod +x $out/bin/load-env-${name}
''; '';
} }