tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
treewide: make AppRun substitutions constistent
Pavol Rusnak
4 years ago
28de4ac6
09da9d94
+16
-12
11 changed files
expand all
collapse all
unified
split
pkgs
applications
audio
apple-music-electron
default.nix
nuclear
default.nix
plexamp
default.nix
blockchains
crypto-org-wallet.nix
trezor-suite
default.nix
graphics
runwayml
default.nix
misc
zettlr
default.nix
networking
pcloud
default.nix
office
timeular
default.nix
video
lbry
default.nix
tools
misc
betterdiscord-installer
default.nix
+1
-1
pkgs/applications/audio/apple-music-electron/default.nix
···
18
18
19
19
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
20
20
substituteInPlace $out/share/applications/${pname}.desktop \
21
21
-
--replace "Exec=AppRun" "Exec=$out/bin/apple-music-electron"
21
21
+
--replace 'Exec=AppRun' 'Exec=${pname}'
22
22
cp -r ${appimageContents}/usr/share/icons $out/share
23
23
'';
24
24
+1
-1
pkgs/applications/audio/nuclear/default.nix
···
18
18
19
19
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
20
20
substituteInPlace $out/share/applications/${pname}.desktop \
21
21
-
--replace 'Exec=AppRun' 'Exec=$out/bin/nuclear'
21
21
+
--replace 'Exec=AppRun' 'Exec=${pname}'
22
22
cp -r ${appimageContents}/usr/share/icons $out/share
23
23
'';
24
24
+1
-1
pkgs/applications/audio/plexamp/default.nix
···
25
25
install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop
26
26
install -m 444 -D ${appimageContents}/plexamp.png \
27
27
$out/share/icons/hicolor/512x512/apps/plexamp.png
28
28
-
substituteInPlace $out/share/applications/plexamp.desktop \
28
28
+
substituteInPlace $out/share/applications/${pname}.desktop \
29
29
--replace 'Exec=AppRun' 'Exec=${pname}'
30
30
'';
31
31
+1
-1
pkgs/applications/blockchains/crypto-org-wallet.nix
···
20
20
${imagemagick}/bin/convert ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png
21
21
install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
22
22
substituteInPlace $out/share/applications/${pname}.desktop \
23
23
-
--replace 'Exec=AppRun --no-sandbox %U' "Exec=$out/bin/${pname}"
23
23
+
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
24
24
'';
25
25
26
26
meta = with lib; {
+2
-1
pkgs/applications/blockchains/trezor-suite/default.nix
···
35
35
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
36
36
install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png
37
37
install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
38
38
-
substituteInPlace $out/share/applications/trezor-suite.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
38
38
+
substituteInPlace $out/share/applications/${pname}.desktop \
39
39
+
--replace 'Exec=AppRun' 'Exec=${pname}'
39
40
40
41
# symlink system binaries instead bundled ones
41
42
mkdir -p $out/share/${pname}/resources/bin/{bridge,tor}
+2
-1
pkgs/applications/graphics/runwayml/default.nix
···
31
31
postBuild = ''
32
32
mkdir -p $out/share/pixmaps/ $out/share/applications
33
33
cp ${appimage-contents}/usr/share/icons/hicolor/1024x1024/apps/runway.png $out/share/pixmaps/runway.png
34
34
-
sed 's:Exec=AppRun:Exec=runwayml:' ${appimage-contents}/runway.desktop > $out/share/applications/runway.desktop
34
34
+
substituteInPlace ${appimage-contents}/runway.desktop \
35
35
+
--replace 'Exec=AppRun' 'Exec=${pname}'
35
36
'';
36
37
37
38
meta = with lib; {
+2
-1
pkgs/applications/misc/zettlr/default.nix
···
33
33
mv $out/bin/{${name},${pname}}
34
34
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop
35
35
install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png
36
36
-
substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
36
36
+
substituteInPlace $out/share/applications/zettlr.desktop \
37
37
+
--replace 'Exec=AppRun' 'Exec=${pname}'
37
38
'';
38
39
39
40
meta = with lib; {
+2
-2
pkgs/applications/networking/pcloud/default.nix
···
84
84
substitute \
85
85
app/pcloud.desktop \
86
86
share/applications/pcloud.desktop \
87
87
-
--replace "Name=pcloud" "Name=pCloud" \
88
88
-
--replace "Exec=AppRun" "Exec=$out/bin/pcloud"
87
87
+
--replace 'Name=pcloud' 'Name=pCloud' \
88
88
+
--replace 'Exec=AppRun' 'Exec=${pname}'
89
89
90
90
# Build the main executable
91
91
cat > bin/pcloud <<EOF
+2
-1
pkgs/applications/office/timeular/default.nix
···
26
26
mv $out/bin/{${name},${pname}}
27
27
install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop
28
28
install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png
29
29
-
substituteInPlace $out/share/applications/timeular.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
29
29
+
substituteInPlace $out/share/applications/timeular.desktop \
30
30
+
--replace 'Exec=AppRun' 'Exec=${pname}'
30
31
'';
31
32
32
33
meta = with lib; {
+1
-1
pkgs/applications/video/lbry/default.nix
···
29
29
# Now, install assets such as the desktop file and icons
30
30
install -m 444 -D ${src}/lbry.desktop -t $out/share/applications
31
31
substituteInPlace $out/share/applications/lbry.desktop \
32
32
-
--replace 'AppRun' '$out/bin/lbry'
32
32
+
--replace 'Exec=AppRun' 'Exec=lbry'
33
33
cp -r ${src}/usr/share/icons $out/share
34
34
'';
35
35
+1
-1
pkgs/tools/misc/betterdiscord-installer/default.nix
···
18
18
19
19
install -m 444 -D ${appimageContents}/betterdiscord.desktop -t $out/share/applications
20
20
substituteInPlace $out/share/applications/betterdiscord.desktop \
21
21
-
--replace "Exec=AppRun" "Exec=$out/bin/${pname}"
21
21
+
--replace 'Exec=AppRun' 'Exec=${pname}'
22
22
cp -r ${appimageContents}/usr/share/icons $out/share
23
23
'';
24
24