dash: Add meta.mainProgram and cleanup

1 files changed, 14 insertions, 13 deletions

diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index ff4656f6650..6bdbd1798e3 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -8,13 +8,13 @@
 , dash
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dash";
   version = "0.5.12";
 
   src = fetchurl {
-    url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz";
-    sha256 = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo=";
+    url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz";
+    hash = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo=";
   };
 
   strictDeps = true;
@@ -31,22 +31,23 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
-    homepage = "http://gondor.apana.org.au/~herbert/dash/";
-    description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible";
-    platforms = platforms.unix;
-    license = with licenses; [ bsd3 gpl2 ];
-  };
-
   passthru = {
     shellPath = "/bin/dash";
     tests = {
-      "execute-simple-command" = runCommand "${pname}-execute-simple-command" { } ''
+      "execute-simple-command" = runCommand "dash-execute-simple-command" { } ''
         mkdir $out
-        ${dash}/bin/dash -c 'echo "Hello World!" > $out/success'
+        ${lib.getExe dash} -c 'echo "Hello World!" > $out/success'
         [ -s $out/success ]
         grep -q "Hello World" $out/success
       '';
     };
   };
-}
+
+  meta = with lib; {
+    homepage = "http://gondor.apana.org.au/~herbert/dash/";
+    description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible";
+    platforms = platforms.unix;
+    license = with licenses; [ bsd3 gpl2 ];
+    mainProgram = "dash";
+  };
+})