Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e99ec699a43b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05e661f66504
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 27, 2020

  1. joplin-desktop: Add a desktop Item for joplin-desktop

    @Scriptkiddi @Lassulus
    Scriptkiddi authored and Lassulus committed Jan 27, 2020
    1
    Copy the full SHA
    05e661f View commit details
Showing with 13 additions and 2 deletions.
  1. +13 −2 pkgs/applications/misc/joplin-desktop/default.nix
15 changes: 13 additions & 2 deletions pkgs/applications/misc/joplin-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, makeDesktopItem }:

let
pname = "joplin-desktop";
version = "1.0.177";
desktopItem = makeDesktopItem {
name = "Joplin";
exec = "joplin-desktop";
type = "Application";
desktopName = "Joplin";
};
in appimageTools.wrapType2 rec {
name = "${pname}-${version}";
src = fetchurl {
@@ -18,7 +24,12 @@ in appimageTools.wrapType2 rec {

multiPkgs = null; # no 32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = "mv $out/bin/{${name},${pname}}";
extraInstallCommands = ''
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications
mv $out/bin/{${name},${pname}}
'';


meta = with lib; {
description = "An open source note taking and to-do application with synchronisation capabilities";