treewide: name -> pname (easy cases) (#66585)
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zookeeper-${version}";
|
||||
pname = "zookeeper";
|
||||
version = "3.4.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
|
||||
url = "mirror://apache/zookeeper/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0karf13zks3ba2rdmma2lyabvmasc04cjmgxp227f0nj8677kvbw";
|
||||
};
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -R conf docs lib ${name}.jar $out
|
||||
cp -R conf docs lib ${pname}-${version}.jar $out
|
||||
mkdir -p $out/bin
|
||||
cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin
|
||||
patchShebangs $out/bin
|
||||
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
|
||||
chmod -x $out/bin/zkEnv.sh
|
||||
|
||||
mkdir -p $out/share/zooinspector
|
||||
cp -r contrib/ZooInspector/{${name}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector
|
||||
cp -r contrib/ZooInspector/{${pname}-${version}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector
|
||||
|
||||
classpath="$out/${name}.jar:$out/share/zooinspector/${name}-ZooInspector.jar"
|
||||
classpath="$out/${pname}-${version}.jar:$out/share/zooinspector/${pname}-${version}-ZooInspector.jar"
|
||||
for jar in $out/lib/*.jar $out/share/zooinspector/lib/*.jar; do
|
||||
classpath="$classpath:$jar"
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user