tools: replace name with pname&version

1 files changed, 5 insertions, 4 deletions

diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix
index 6fafc1c253a96..ad12234bf27b5 100644
--- a/pkgs/tools/admin/daemontools/default.nix
+++ b/pkgs/tools/admin/daemontools/default.nix
@@ -1,24 +1,25 @@
 { fetchurl, bash, glibc, lib, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "daemontools-0.76";
+  pname = "daemontools";
+  version = "0.76";
 
   src = fetchurl {
-    url = "https://cr.yp.to/daemontools/${name}.tar.gz";
+    url = "https://cr.yp.to/daemontools/daemontools-${version}.tar.gz";
     sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5";
   };
 
   patches = [ ./fix-nix-usernamespace-build.patch ];
 
   configurePhase = ''
-    cd ${name}
+    cd daemontools-${version}
 
     sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
 
     substituteInPlace src/Makefile \
       --replace '/bin/sh' '${bash}/bin/bash -oxtrace'
 
-    sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests
+    sed -ie "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests
 
     cat ${glibc.dev}/include/errno.h
   '';