ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

jetbrains: execName -> mainProgram

Browse Source 
For consistency
This commit is contained in:
Atemu 2021-06-03 14:25:20 +02:00
parent 87b65fa13f
commit 632417e369
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/editors/jetbrains/common.nix
View File

@ -9,7 +9,7 @@ with lib;
let loName = toLower product; let loName = toLower product;
hiName = toUpper product; hiName = toUpper product;
execName = concatStringsSep "-" (init (splitString "-" name)); mainProgram = concatStringsSep "-" (init (splitString "-" name));
vmoptsName = loName vmoptsName = loName
+ ( if (with stdenv.hostPlatform; (is32bit || isDarwin)) + ( if (with stdenv.hostPlatform; (is32bit || isDarwin))
then "" then ""
@ -19,16 +19,16 @@ in
with stdenv; lib.makeOverridable mkDerivation rec { with stdenv; lib.makeOverridable mkDerivation rec {
inherit name src; inherit name src;
meta = args.meta // { mainProgram = execName; }; meta = args.meta // { inherit mainProgram; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = execName; name = mainProgram;
exec = execName; exec = mainProgram;
comment = lib.replaceChars ["\n"] [" "] meta.longDescription; comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
desktopName = product; desktopName = product;
genericName = meta.description; genericName = meta.description;
categories = "Development;"; categories = "Development;";
icon = execName; icon = mainProgram;
extraEntries = '' extraEntries = ''
StartupWMClass=${wmClass} StartupWMClass=${wmClass}
''; '';
@ -66,13 +66,13 @@ with stdenv; lib.makeOverridable mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
cp -a . $out/$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}/. mv bin/fsnotifier* $out/libexec/${name}/.
jdk=${jdk.home} jdk=${jdk.home}
item=${desktopItem} 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 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 ([ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
# Some internals want libstdc++.so.6 # Some internals want libstdc++.so.6