From 9f73f39527b60d658a6b223f4b18361959f21f10 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Mon, 26 Mar 2012 10:20:32 +0000 Subject: [PATCH] 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 --- pkgs/misc/my-env/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 660b757f327..dc729ec557a 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -14,7 +14,7 @@ # Then you can install it by: # $ nix-env -i sdl-env # 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 # headers and libs. @@ -49,8 +49,8 @@ # Now we should build our newly defined custom environment using this command on a shell, so type: # $ nix-env -i env-nix - # You can load the environment simply typing a "load-${name}-env" command. - # $ load-nix-env + # You can load the environment simply typing a "load-env-${name}" command. + # $ load-env-nix # The result using that command should be: # env-nix loaded and show you a shell with a prefixed prompt. @@ -129,7 +129,7 @@ mkDerivation { mkdir -p $out/bin sed -e s,@shell@,${shell}, -e s,@myenvpath@,$out/dev-envs/${name}, \ - -e s,@name@,${name}, ${./loadenv.sh} > $out/bin/load-${name}-env - chmod +x $out/bin/load-${name}-env + -e s,@name@,${name}, ${./loadenv.sh} > $out/bin/load-env-${name} + chmod +x $out/bin/load-env-${name} ''; }