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
, 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