* Sync example with manual.

svn path=/nixpkgs/trunk/; revision=1687

4 files changed, 11 insertions, 10 deletions

diff --git a/pkgs/applications/misc/hello/builder.sh b/pkgs/applications/misc/hello/builder.sh
deleted file mode 100644
index bc2a48e30e41d..0000000000000
--- a/pkgs/applications/misc/hello/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-buildinputs="$perl"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd hello-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/applications/misc/hello/ex-1/builder.sh b/pkgs/applications/misc/hello/ex-1/builder.sh
new file mode 100644
index 0000000000000..befc4b1746897
--- /dev/null
+++ b/pkgs/applications/misc/hello/ex-1/builder.sh
@@ -0,0 +1,9 @@
+. $stdenv/setup
+
+PATH=$perl/bin:$PATH
+
+tar xvfz $src
+cd hello-*
+./configure --prefix=$out
+make
+make install
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix
index 0ea1f12ad745e..ac127af6ce513 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/ex-1/default.nix
@@ -7,5 +7,5 @@ stdenv.mkDerivation {
     url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
-  perl = perl;
+  inherit perl;
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 5805d56d62494..594a4d183ccc4 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -863,7 +863,7 @@ rec {
     inherit (gtkLibs) gtk;
   };
 
-  hello = (import ../applications/misc/hello) {
+  hello = (import ../applications/misc/hello/ex-1) {
     inherit fetchurl stdenv perl;
   };