diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-28 17:44:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-28 17:44:03 +0000 |
| commit | a1ea2cf91214ccb0c0c34c4eccdf60c5b5321394 (patch) | |
| tree | 64cf656ce6ea092104d901ed8a6c5369a082775d /pkgs | |
| parent | fb4ce491b50a4821e0f5e800876ba8caf2255fe3 (diff) | |
| parent | bf78367499a186318e73e93c6aa9b7f8d584f045 (diff) | |
| download | nixlib-a1ea2cf91214ccb0c0c34c4eccdf60c5b5321394.tar nixlib-a1ea2cf91214ccb0c0c34c4eccdf60c5b5321394.tar.gz nixlib-a1ea2cf91214ccb0c0c34c4eccdf60c5b5321394.tar.bz2 nixlib-a1ea2cf91214ccb0c0c34c4eccdf60c5b5321394.tar.lz nixlib-a1ea2cf91214ccb0c0c34c4eccdf60c5b5321394.tar.xz nixlib-a1ea2cf91214ccb0c0c34c4eccdf60c5b5321394.tar.zst nixlib-a1ea2cf91214ccb0c0c34c4eccdf60c5b5321394.zip | |
Merge pull request #74467 from Kiwi/simplenote-update
simplenote: 1.9.1 -> 1.11.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/simplenote/default.nix | 54 |
1 files changed, 37 insertions, 17 deletions
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index be8e21054010..1829407705b9 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,23 +1,37 @@ -{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper -, stdenv, udev, wrapGAppsHook }: +{ atomEnv +, autoPatchelfHook +, dpkg +, fetchurl +, makeDesktopItem +, makeWrapper +, stdenv +, udev +, wrapGAppsHook +}: let inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + pname = "simplenote"; - version = "1.9.1"; + version = "1.11.0"; sha256 = { - x86_64-linux = "1zqrjh1xfdpkpj1fsri9r4qkazh9j89pbj8vjr474b39v56v693j"; - }.${system}; + x86_64-linux = "1ljam1yfiy1lh6lrknrq7cdqpj1q7f655mxjiiwv3izp98qr1f8s"; + }.${system} or throwSystem; meta = with stdenv.lib; { description = "The simplest way to keep notes"; homepage = "https://github.com/Automattic/simplenote-electron"; license = licenses.gpl2; - maintainers = with maintainers; [ kiwi ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ + kiwi + ]; + platforms = [ + "x86_64-linux" + ]; }; linux = stdenv.mkDerivation rec { @@ -31,14 +45,14 @@ let }; desktopItem = makeDesktopItem { - name = "simplenote"; + categories = "Development"; comment = "Simplenote for Linux"; + desktopName = "Simplenote"; exec = "simplenote %U"; icon = "simplenote"; - type = "Application"; + name = "simplenote"; startupNotify = "true"; - desktopName = "Simplenote"; - categories = "Development"; + type = "Application"; }; dontBuild = true; @@ -46,9 +60,14 @@ let dontPatchELF = true; dontWrapGApps = true; - buildInputs = atomEnv.packages; + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + wrapGAppsHook + ]; - nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; + buildInputs = atomEnv.packages; unpackPhase = "dpkg-deb -x $src ."; @@ -62,14 +81,15 @@ let cp "${desktopItem}/share/applications/"* "$out/share/applications" ''; - runtimeDependencies = [ udev.lib ]; + runtimeDependencies = [ + udev.lib + ]; postFixup = '' - ls -ahl $out makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \ - "''${gappsWrapperArgs[@]}" + "''${gappsWrapperArgs[@]}" ''; }; in - linux +linux |