diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-04-21 16:31:47 +0200 |
|---|---|---|
| committer | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-04-24 15:26:52 +0200 |
| commit | 985aa8174d940615c6966fd66b3cbf585e5697d4 (patch) | |
| tree | a4f9ed21bae32db6bf4f521d3b7ec79b6fec8f29 /pkgs/tools/misc/via/default.nix | |
| parent | 9a1ba358e5f9d9ace76de868758306f31a208806 (diff) | |
treewide: unbreak appimageTools.wrapType2 builds
`appimageTools.wrapType2` no longer creates a binary `$out/bin/${name}` if `pname` and `version` is provided.
Derivations that have worked around this behavior with a `mv $out/bin/{${name},${pname}}` broke as a result.
This should fix most instances.
contex: #271071
Diffstat (limited to 'pkgs/tools/misc/via/default.nix')
| -rw-r--r-- | pkgs/tools/misc/via/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix index 47f3df7743780..ffcd456e75fff 100644 --- a/pkgs/tools/misc/via/default.nix +++ b/pkgs/tools/misc/via/default.nix @@ -3,16 +3,15 @@ let pname = "via"; version = "3.0.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage"; name = "via-${version}-linux.AppImage"; sha256 = "sha256-+uTvmrqHK7L5VA/lUHCZZeRYPUrcVA+vjG7venxuHhs="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; profile = '' # Skip prompt to add udev rule. @@ -21,7 +20,6 @@ appimageTools.wrapType2 { ''; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/via-nativia.desktop -t $out/share/applications substituteInPlace $out/share/applications/via-nativia.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' |