mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
sublime4,sublime-merge: Use --replace-fail
Also split the substitute call for legibility.
This commit is contained in:
parent
86c02994a0
commit
eb7298e58b
|
@ -158,7 +158,12 @@ stdenv.mkDerivation (rec {
|
|||
)
|
||||
+ ''
|
||||
mkdir -p "$out/share/applications"
|
||||
substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
|
||||
|
||||
substitute \
|
||||
"''$${primaryBinary}/${primaryBinary}.desktop" \
|
||||
"$out/share/applications/${primaryBinary}.desktop" \
|
||||
--replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
|
||||
|
||||
for directory in ''$${primaryBinary}/Icon/*; do
|
||||
size=$(basename $directory)
|
||||
mkdir -p "$out/share/icons/hicolor/$size/apps"
|
||||
|
|
|
@ -161,7 +161,12 @@ stdenv.mkDerivation (rec {
|
|||
)
|
||||
+ ''
|
||||
mkdir -p "$out/share/applications"
|
||||
substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
|
||||
|
||||
substitute \
|
||||
"''$${primaryBinary}/${primaryBinary}.desktop" \
|
||||
"$out/share/applications/${primaryBinary}.desktop" \
|
||||
--replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
|
||||
|
||||
for directory in ''$${primaryBinary}/Icon/*; do
|
||||
size=$(basename $directory)
|
||||
mkdir -p "$out/share/icons/hicolor/$size/apps"
|
||||
|
|
Loading…
Reference in a new issue