diff options
| author | Michael Hoang <enzime@users.noreply.github.com> | 2023-10-02 22:16:32 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2023-10-04 20:30:13 +0200 |
| commit | 6d847579f752028bddea5e0e07bf20c04ed84d2c (patch) | |
| tree | 59e1da815cb1076dc4225be8aa03fc8e2f4335d8 /pkgs/applications/misc/joplin-desktop/default.nix | |
| parent | 9b6f1249744924973e9c701c1d8d3f56ea97eced (diff) | |
joplin-desktop: remove usage of `name`
Diffstat (limited to 'pkgs/applications/misc/joplin-desktop/default.nix')
| -rw-r--r-- | pkgs/applications/misc/joplin-desktop/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index a2262134f66c9..840eb846c271a 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -3,7 +3,6 @@ let pname = "joplin-desktop"; version = "2.12.18"; - name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -24,7 +23,7 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; meta = with lib; { @@ -43,7 +42,7 @@ let }; linux = appimageTools.wrapType2 rec { - inherit name src meta; + inherit pname version src meta; profile = '' export LC_ALL=C.UTF-8 @@ -52,7 +51,7 @@ let multiArch = false; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-${version},${pname}} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" @@ -65,7 +64,7 @@ let }; darwin = stdenv.mkDerivation { - inherit name src meta; + inherit pname version src meta; nativeBuildInputs = [ undmg ]; |