@@ -9,7 +9,7 @@ with lib;
99
1010let loName = toLower product;
1111 hiName = toUpper product;
12− execName = concatStringsSep "-" (init (splitString "-" name));
12+ mainProgram = concatStringsSep "-" (init (splitString "-" name));
1313 vmoptsName = loName
1414 + ( if (with stdenv.hostPlatform; (is32bit || isDarwin))
1515 then ""
@@ -19,16 +19,16 @@ in
1919
2020with stdenv; lib.makeOverridable mkDerivation rec {
2121 inherit name src;
22− meta = args.meta // { mainProgram = execName; };
22+ meta = args.meta // { inherit mainProgram; };
2323
2424 desktopItem = makeDesktopItem {
25− name = execName;
26− exec = execName;
25+ name = mainProgram;
26+ exec = mainProgram;
2727 comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
2828 desktopName = product;
2929 genericName = meta.description;
3030 categories = "Development;";
31− icon = execName;
31+ icon = mainProgram;
3232 extraEntries = ''
3333 StartupWMClass=${wmClass}
3434 '';
@@ -66,13 +66,13 @@ with stdenv; lib.makeOverridable mkDerivation rec {
6666 installPhase = ''
6767 mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
6868 cp -a . $out/$name
69− ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
69+ ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png
7070 mv bin/fsnotifier* $out/libexec/${name}/.
7171
7272 jdk=${jdk.home}
7373 item=${desktopItem}
7474
75− makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
75+ makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \
7676 --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
7777 --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
7878 # Some internals want libstdc++.so.6