treewide: name -> pname

This commit is contained in:
volth
2019-08-17 10:54:38 +00:00
parent fe9a3e3e63
commit c814d72b51
520 changed files with 1164 additions and 622 deletions
@@ -13,7 +13,8 @@ let
gwtVer = "2.8.1";
in
stdenv.mkDerivation rec {
name = "RStudio-${version}";
pname = "RStudio";
inherit version;
nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
@@ -98,7 +99,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
desktopItem = makeDesktopItem {
name = name;
name = "${pname}-${version}";
exec = "rstudio %F";
icon = "rstudio";
desktopName = "RStudio";