summary refs log tree commit diff
path: root/pkgs/applications/editors/jetbrains
diff options
context:
space:
mode:
authorAtemu <atemu.main@gmail.com>2021-06-03 14:25:20 +0200
committerAtemu <atemu.main@gmail.com>2021-06-03 14:40:19 +0200
commit632417e36968d4881fa64a4d4be0e217c11db45b (patch)
tree267977c9dacbd4c56d1c6f1a9df337ebf75b2b9b /pkgs/applications/editors/jetbrains
parent87b65fa13fabb1a3d895d8d0b0185bf2a556951e (diff)
downloadnixpkgs-632417e36968d4881fa64a4d4be0e217c11db45b.tar
nixpkgs-632417e36968d4881fa64a4d4be0e217c11db45b.tar.gz
nixpkgs-632417e36968d4881fa64a4d4be0e217c11db45b.tar.bz2
nixpkgs-632417e36968d4881fa64a4d4be0e217c11db45b.tar.lz
nixpkgs-632417e36968d4881fa64a4d4be0e217c11db45b.tar.xz
nixpkgs-632417e36968d4881fa64a4d4be0e217c11db45b.tar.zst
nixpkgs-632417e36968d4881fa64a4d4be0e217c11db45b.zip
jetbrains: execName -> mainProgram
For consistency
Diffstat (limited to 'pkgs/applications/editors/jetbrains')
-rw-r--r--pkgs/applications/editors/jetbrains/common.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index c9903b4a460..dcbaa136795 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -9,7 +9,7 @@ with lib;
 
 let loName = toLower product;
     hiName = toUpper product;
-    execName = concatStringsSep "-" (init (splitString "-" name));
+    mainProgram = concatStringsSep "-" (init (splitString "-" name));
     vmoptsName = loName
                + ( if (with stdenv.hostPlatform; (is32bit || isDarwin))
                    then ""
@@ -19,16 +19,16 @@ in
 
 with stdenv; lib.makeOverridable mkDerivation rec {
   inherit name src;
-  meta = args.meta // { mainProgram = execName; };
+  meta = args.meta // { inherit mainProgram; };
 
   desktopItem = makeDesktopItem {
-    name = execName;
-    exec = execName;
+    name = mainProgram;
+    exec = mainProgram;
     comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
     desktopName = product;
     genericName = meta.description;
     categories = "Development;";
-    icon = execName;
+    icon = mainProgram;
     extraEntries = ''
       StartupWMClass=${wmClass}
     '';
@@ -66,13 +66,13 @@ with stdenv; lib.makeOverridable mkDerivation rec {
   installPhase = ''
     mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
     cp -a . $out/$name
-    ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
+    ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png
     mv bin/fsnotifier* $out/libexec/${name}/.
 
     jdk=${jdk.home}
     item=${desktopItem}
 
-    makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
+    makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \
       --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
       --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
         # Some internals want libstdc++.so.6