diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index eaf5ef0e0f31..5497b1909093 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -37,7 +37,7 @@ with versionMap.${majorVersion}; stdenv.mkDerivation rec { inherit version; - name = "scala-${version}"; + pname = "scala"; src = fetchurl { inherit hash; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { mv * $out # put docs in correct subdirectory mkdir -p $out/share/doc - mv $out/doc $out/share/doc/${name} + mv $out/doc $out/share/doc/${pname}-${version} mv $out/man $out/share/man for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \