diff options
| author | volth <volth@volth.com> | 2019-08-13 21:52:01 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2019-08-17 10:54:38 +0000 |
| commit | c814d72b517bb201c8bbbfc64e386c7023352886 (patch) | |
| tree | 3a7b3bb7326a2087a34e5333aa8dbc367ec2deb1 /pkgs/applications/editors/rstudio/default.nix | |
| parent | fe9a3e3e63fa59c8014d454b0efd3231bdd19350 (diff) | |
| download | nixlib-c814d72b517bb201c8bbbfc64e386c7023352886.tar nixlib-c814d72b517bb201c8bbbfc64e386c7023352886.tar.gz nixlib-c814d72b517bb201c8bbbfc64e386c7023352886.tar.bz2 nixlib-c814d72b517bb201c8bbbfc64e386c7023352886.tar.lz nixlib-c814d72b517bb201c8bbbfc64e386c7023352886.tar.xz nixlib-c814d72b517bb201c8bbbfc64e386c7023352886.tar.zst nixlib-c814d72b517bb201c8bbbfc64e386c7023352886.zip | |
treewide: name -> pname
Diffstat (limited to 'pkgs/applications/editors/rstudio/default.nix')
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index f90e17a6065b..74e5460f529f 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -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"; |