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/misc/notable/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/applications/misc/notable/default.nix')
-rw-r--r-- | pkgs/applications/misc/notable/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 4606ee9432787..45416035f7b34 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -5,15 +5,13 @@ let version = "1.8.4"; sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; - name = "${pname}-${version}"; - src = fetchurl { url = "https://github.com/notable/notable/releases/download/v${version}/Notable-${version}.AppImage"; inherit sha256; }; appimageContents = appimageTools.extract { - inherit name src; + inherit pname version src; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +27,6 @@ appimageTools.wrapType2 rec { multiArch = false; # no 32bit needed extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \ $out/share/icons/hicolor/1024x1024/apps/notable.png |