summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorDaniƫl de Kok <me@danieldk.eu>2020-08-24 06:53:10 +0200
committerGitHub <noreply@github.com>2020-08-24 06:53:10 +0200
commitb1499c30a1e15fb2b471f08767f216acec47c619 (patch)
treea2bf92694c50d2148b74e8bd8de8a3d97b699e22 /pkgs/applications
parentd285ed197d1f3023aefb17db5a03020a49f9f2c8 (diff)
parent4bca06b003c135d50312d4cce7376035cb2346bc (diff)
downloadnixpkgs-b1499c30a1e15fb2b471f08767f216acec47c619.tar
nixpkgs-b1499c30a1e15fb2b471f08767f216acec47c619.tar.gz
nixpkgs-b1499c30a1e15fb2b471f08767f216acec47c619.tar.bz2
nixpkgs-b1499c30a1e15fb2b471f08767f216acec47c619.tar.lz
nixpkgs-b1499c30a1e15fb2b471f08767f216acec47c619.tar.xz
nixpkgs-b1499c30a1e15fb2b471f08767f216acec47c619.tar.zst
nixpkgs-b1499c30a1e15fb2b471f08767f216acec47c619.zip
Merge pull request #96029 from oyren/write_stylus_sha256
write_stylus: refactor (sha256)
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/graphics/write_stylus/default.nix22
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix
index 380f70c7c93..8396ce72e50 100644
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@@ -1,29 +1,22 @@
 { mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, libX11, libXi, 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
-mkDerivation rec {
-  pname = "write_stylus";
-  version = "300";
-
   desktopItem = makeDesktopItem {
     name = "Write";
     exec = "Write";
     comment = "A word processor for handwriting";
-    icon = desktopIcon;
+    icon = "write_stylus";
     desktopName = "Write";
     genericName = "Write";
     categories = "Office;Graphics";
   };
+in
+mkDerivation rec {
+  pname = "write_stylus";
+  version = "300";
 
   src = fetchurl {
     url = "http://www.styluslabs.com/write/write${version}.tar.gz";
-    sha256 = "1kg4qqxgg7iyxl13hkbl3j27dykra56dj67hbv0392mwdcgavihq";
+    sha256 = "0h1wf3af7jzp3f3l8mlnshi83d7a4v4y8nfqfai4lmskyicqlz7c";
   };
 
   sourceRoot = ".";
@@ -36,8 +29,11 @@ mkDerivation rec {
     # symlink the binary to bin/
     ln -s $out/Write/Write $out/bin/Write
 
+    # Create desktop item
     mkdir -p $out/share/applications
     ln -s ${desktopItem}/share/applications/* $out/share/applications/
+    mkdir -p $out/share/icons
+    ln -s $out/Write/Write144x144.png $out/share/icons/write_stylus.png
   '';
   preFixup = let
     libPath = lib.makeLibraryPath [