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/applications/networking/station | |
| 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/applications/networking/station')
| -rw-r--r-- | pkgs/applications/networking/station/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index 43392ae28e483..9712de8fbe4a3 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -3,7 +3,6 @@ let pname = "station"; version = "1.52.2"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}-x86_64.AppImage"; @@ -11,10 +10,10 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; profile = '' export LC_ALL=C.UTF-8 @@ -23,7 +22,6 @@ in appimageTools.wrapType2 rec { multiArch = false; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \ $out/share/icons/hicolor/512x512/apps/browserx.png |