Merge pull request #69340 from srghma/patch-1

write_stylus: fix error "cannot download icon.tar.gz from any mirror"
This commit is contained in:
Matthew Bauer 2019-11-07 17:36:48 -05:00 committed by GitHub
commit 03bd5ae1bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,12 @@
{ stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }: { stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
let
# taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
# license: Free for commercial use
desktopIcon = fetchurl {
url = "https://www.iconfinder.com/icons/50835/download/png/256";
sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8";
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "write_stylus"; pname = "write_stylus";
version = "209"; version = "209";
@ -7,7 +15,7 @@ stdenv.mkDerivation rec {
name = "Write"; name = "Write";
exec = "Write"; exec = "Write";
comment = "A word processor for handwriting"; comment = "A word processor for handwriting";
icon = "write_stylus"; icon = desktopIcon;
desktopName = "Write"; desktopName = "Write";
genericName = "Write"; genericName = "Write";
categories = "Office;Graphics"; categories = "Office;Graphics";
@ -18,13 +26,6 @@ stdenv.mkDerivation rec {
sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd"; sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd";
}; };
# taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
# license: Free for commercial use
icon = fetchurl {
url = "https://oyra.eu/write/icon.tar.gz";
sha256 = "1zd98g63apwi17qc1hm1g14maain5d18g4afadxm30qjz2s0mvs8";
};
sourceRoot = "."; sourceRoot = ".";
dontBuild = true; dontBuild = true;
@ -35,9 +36,6 @@ stdenv.mkDerivation rec {
# symlink the binary to bin/ # symlink the binary to bin/
ln -s $out/Write/Write $out/bin/Write ln -s $out/Write/Write $out/bin/Write
# untar icons
tar -xzf ${icon} *.tar.gz -C $out/
mkdir -p $out/share/applications mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/ ln -s ${desktopItem}/share/applications/* $out/share/applications/
''; '';