diff options
author | Felix Buehler <account@buehler.rocks> | 2021-08-12 21:47:47 +0200 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2021-08-12 21:47:47 +0200 |
commit | 7cd5d178fc6fd403907bfe00f502337c162d7607 (patch) | |
tree | deab830841f24b5fa75a008deb9eeaa03e2a12ba /pkgs/tools/admin | |
parent | 6dfd25fdc4fbbde2b13d3140287cee04f5e9e483 (diff) |
tools: replace name with pname&version
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/daemontools/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/admin/tightvnc/default.nix | 7 |
2 files changed, 9 insertions, 7 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 ''; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 1bfb3be113dab..0da2e7875f08f 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: -stdenv.mkDerivation { - name = "tightvnc-1.3.10"; +stdenv.mkDerivation rec { + pname = "tightvnc"; + version = "1.3.10"; src = fetchurl { - url = "mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2"; + url = "mirror://sourceforge/vnc-tight/tightvnc-${version}_unixsrc.tar.bz2"; sha256 = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d"; }; |