Merge pull request #74467 from Kiwi/simplenote-update

simplenote: 1.9.1 -> 1.11.0
This commit is contained in:
worldofpeace 2019-11-28 17:44:03 +00:00 committed by GitHub
commit a1ea2cf912
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,23 +1,37 @@
{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper { atomEnv
, stdenv, udev, wrapGAppsHook }: , autoPatchelfHook
, dpkg
, fetchurl
, makeDesktopItem
, makeWrapper
, stdenv
, udev
, wrapGAppsHook
}:
let let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
pname = "simplenote"; pname = "simplenote";
version = "1.9.1"; version = "1.11.0";
sha256 = { sha256 = {
x86_64-linux = "1zqrjh1xfdpkpj1fsri9r4qkazh9j89pbj8vjr474b39v56v693j"; x86_64-linux = "1ljam1yfiy1lh6lrknrq7cdqpj1q7f655mxjiiwv3izp98qr1f8s";
}.${system}; }.${system} or throwSystem;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The simplest way to keep notes"; description = "The simplest way to keep notes";
homepage = "https://github.com/Automattic/simplenote-electron"; homepage = "https://github.com/Automattic/simplenote-electron";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ kiwi ]; maintainers = with maintainers; [
platforms = [ "x86_64-linux" ]; kiwi
];
platforms = [
"x86_64-linux"
];
}; };
linux = stdenv.mkDerivation rec { linux = stdenv.mkDerivation rec {
@ -31,14 +45,14 @@ let
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "simplenote"; categories = "Development";
comment = "Simplenote for Linux"; comment = "Simplenote for Linux";
desktopName = "Simplenote";
exec = "simplenote %U"; exec = "simplenote %U";
icon = "simplenote"; icon = "simplenote";
type = "Application"; name = "simplenote";
startupNotify = "true"; startupNotify = "true";
desktopName = "Simplenote"; type = "Application";
categories = "Development";
}; };
dontBuild = true; dontBuild = true;
@ -46,9 +60,14 @@ let
dontPatchELF = true; dontPatchELF = true;
dontWrapGApps = true; dontWrapGApps = true;
buildInputs = atomEnv.packages; nativeBuildInputs = [
autoPatchelfHook
dpkg
makeWrapper
wrapGAppsHook
];
nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; buildInputs = atomEnv.packages;
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = "dpkg-deb -x $src .";
@ -62,14 +81,15 @@ let
cp "${desktopItem}/share/applications/"* "$out/share/applications" cp "${desktopItem}/share/applications/"* "$out/share/applications"
''; '';
runtimeDependencies = [ udev.lib ]; runtimeDependencies = [
udev.lib
];
postFixup = '' postFixup = ''
ls -ahl $out
makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \ makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"
''; '';
}; };
in in
linux linux