alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: make AppRun substitutions constistent

Browse source
This commit is contained in:
Pavol Rusnak 2021-04-17 12:38:37 +02:00
parent 09da9d9473
commit 28de4ac62a
No known key found for this signature in database
GPG key ID: 91F3B339B9A02A3D
11 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/audio/apple-music-electron/default.nix
View file

@ -18,7 +18,7 @@ in appimageTools.wrapType2 {
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \ substituteInPlace $out/share/applications/${pname}.desktop \
--replace "Exec=AppRun" "Exec=$out/bin/apple-music-electron" --replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share cp -r ${appimageContents}/usr/share/icons $out/share
''; '';

2
pkgs/applications/audio/nuclear/default.nix
View file

@ -18,7 +18,7 @@ in appimageTools.wrapType2 {
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \ substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=$out/bin/nuclear' --replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share cp -r ${appimageContents}/usr/share/icons $out/share
''; '';

2
pkgs/applications/audio/plexamp/default.nix
View file

@ -25,7 +25,7 @@ in appimageTools.wrapType2 {
install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop
install -m 444 -D ${appimageContents}/plexamp.png \ install -m 444 -D ${appimageContents}/plexamp.png \
$out/share/icons/hicolor/512x512/apps/plexamp.png $out/share/icons/hicolor/512x512/apps/plexamp.png
substituteInPlace $out/share/applications/plexamp.desktop \ substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}' --replace 'Exec=AppRun' 'Exec=${pname}'
''; '';

2
pkgs/applications/blockchains/crypto-org-wallet.nix
View file

@ -20,7 +20,7 @@ in appimageTools.wrapType2 rec {
${imagemagick}/bin/convert ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png ${imagemagick}/bin/convert ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png
install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
substituteInPlace $out/share/applications/${pname}.desktop \ substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun --no-sandbox %U' "Exec=$out/bin/${pname}" --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
''; '';
meta = with lib; { meta = with lib; {

3
pkgs/applications/blockchains/trezor-suite/default.nix
View file

@ -35,7 +35,8 @@ appimageTools.wrapType2 rec {
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png
install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
substituteInPlace $out/share/applications/trezor-suite.desktop --replace 'Exec=AppRun' 'Exec=${pname}' substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
# symlink system binaries instead bundled ones # symlink system binaries instead bundled ones
mkdir -p $out/share/${pname}/resources/bin/{bridge,tor} mkdir -p $out/share/${pname}/resources/bin/{bridge,tor}

3
pkgs/applications/graphics/runwayml/default.nix
View file

@ -31,7 +31,8 @@ in
postBuild = '' postBuild = ''
mkdir -p $out/share/pixmaps/ $out/share/applications mkdir -p $out/share/pixmaps/ $out/share/applications
cp ${appimage-contents}/usr/share/icons/hicolor/1024x1024/apps/runway.png $out/share/pixmaps/runway.png cp ${appimage-contents}/usr/share/icons/hicolor/1024x1024/apps/runway.png $out/share/pixmaps/runway.png
sed 's:Exec=AppRun:Exec=runwayml:' ${appimage-contents}/runway.desktop > $out/share/applications/runway.desktop substituteInPlace ${appimage-contents}/runway.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
''; '';
meta = with lib; { meta = with lib; {

3
pkgs/applications/misc/zettlr/default.nix
View file

@ -33,7 +33,8 @@ appimageTools.wrapType2 rec {
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop
install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png
substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}' substituteInPlace $out/share/applications/zettlr.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/networking/pcloud/default.nix
View file

@ -84,8 +84,8 @@ in stdenv.mkDerivation {
substitute \ substitute \
app/pcloud.desktop \ app/pcloud.desktop \
share/applications/pcloud.desktop \ share/applications/pcloud.desktop \
--replace "Name=pcloud" "Name=pCloud" \ --replace 'Name=pcloud' 'Name=pCloud' \
--replace "Exec=AppRun" "Exec=$out/bin/pcloud" --replace 'Exec=AppRun' 'Exec=${pname}'
# Build the main executable # Build the main executable
cat > bin/pcloud <<EOF cat > bin/pcloud <<EOF

3
pkgs/applications/office/timeular/default.nix
View file

@ -26,7 +26,8 @@ in appimageTools.wrapType2 rec {
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop
install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png
substituteInPlace $out/share/applications/timeular.desktop --replace 'Exec=AppRun' 'Exec=${pname}' substituteInPlace $out/share/applications/timeular.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
''; '';
meta = with lib; { meta = with lib; {

2
pkgs/applications/video/lbry/default.nix
View file

@ -29,7 +29,7 @@ in appimageTools.wrapAppImage rec {
# Now, install assets such as the desktop file and icons # Now, install assets such as the desktop file and icons
install -m 444 -D ${src}/lbry.desktop -t $out/share/applications install -m 444 -D ${src}/lbry.desktop -t $out/share/applications
substituteInPlace $out/share/applications/lbry.desktop \ substituteInPlace $out/share/applications/lbry.desktop \
--replace 'AppRun' '$out/bin/lbry' --replace 'Exec=AppRun' 'Exec=lbry'
cp -r ${src}/usr/share/icons $out/share cp -r ${src}/usr/share/icons $out/share
''; '';

2
pkgs/tools/misc/betterdiscord-installer/default.nix
View file

@ -18,7 +18,7 @@ in appimageTools.wrapType2 {
install -m 444 -D ${appimageContents}/betterdiscord.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/betterdiscord.desktop -t $out/share/applications
substituteInPlace $out/share/applications/betterdiscord.desktop \ substituteInPlace $out/share/applications/betterdiscord.desktop \
--replace "Exec=AppRun" "Exec=$out/bin/${pname}" --replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share cp -r ${appimageContents}/usr/share/icons $out/share
''; '';