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/video | |
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/video')
4 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/applications/video/electronplayer/electronplayer.nix b/pkgs/applications/video/electronplayer/electronplayer.nix index 270d5543c9939..cc26adc24780a 100644 --- a/pkgs/applications/video/electronplayer/electronplayer.nix +++ b/pkgs/applications/video/electronplayer/electronplayer.nix @@ -2,21 +2,18 @@ let pname = "electronplayer"; version = "2.0.8"; - name = "${pname}-${version}"; #TODO: remove the -rc4 from the tag in the url when possible src = fetchurl { - url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${name}.AppImage"; + url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${pname}-${version}.AppImage"; sha256 = "wAsmSFdbRPnYnDyWQSbtyj+GLJLN7ibksUE7cegfkhI="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=ElectronPlayer' diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix index b7c03850c951c..c3eb942fed929 100644 --- a/pkgs/applications/video/lbry/default.nix +++ b/pkgs/applications/video/lbry/default.nix @@ -1,14 +1,12 @@ { lib, fetchurl, appimageTools}: -let +appimageTools.wrapAppImage rec { pname = "lbry-desktop"; version = "0.53.9"; -in appimageTools.wrapAppImage rec { - name = "${pname}-${version}"; # Fetch from GitHub Releases and extract src = appimageTools.extract { - inherit name; + inherit pname version; src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml @@ -24,7 +22,7 @@ in appimageTools.wrapAppImage rec { # General fixup extraInstallCommands = '' # Firstly, rename the executable to lbry for convinence - mv $out/bin/${name} $out/bin/lbry + mv $out/bin/${pname} $out/bin/lbry # Now, install assets such as the desktop file and icons install -m 444 -D ${src}/lbry.desktop -t $out/share/applications diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index d75adb88f359c..776950d51ecc1 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -32,7 +32,6 @@ in extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},losslesscut} ( mkdir -p $out/share cd ${extracted}/usr diff --git a/pkgs/applications/video/molotov/default.nix b/pkgs/applications/video/molotov/default.nix index 1930f06ffdb60..58e66c8f77ae8 100644 --- a/pkgs/applications/video/molotov/default.nix +++ b/pkgs/applications/video/molotov/default.nix @@ -12,7 +12,6 @@ in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D \ ${appimageContents}/@molotovdesktop-wrapper.desktop \ $out/share/applications/${pname}.desktop |