Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1cee79c4dc59
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 03bd5ae1bf2a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 24, 2019

  1. write_stylus: fix error "cannot download icon.tar.gz from any mirror" 

    error message was

```
trying https://oyra.eu/write/icon.tar.gz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
curl: (22) The requested URL returned error: 404 Not Found
error: cannot download icon.tar.gz from any mirror
```
    @srghma
    srghma committed Sep 24, 2019
    Copy the full SHA
    e92866d View commit details

Commits on Nov 7, 2019

  1. Merge pull request #69340 from srghma/patch-1 

    write_stylus: fix error "cannot download icon.tar.gz from any mirror"
    @matthewbauer
    matthewbauer authored Nov 7, 2019
    Copy the full SHA
    03bd5ae View commit details
Showing with 9 additions and 11 deletions.
  1. +9 −11 pkgs/applications/graphics/write_stylus/default.nix
20 changes: 9 additions & 11 deletions pkgs/applications/graphics/write_stylus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{ 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 {
pname = "write_stylus";
version = "209";
@@ -7,7 +15,7 @@ stdenv.mkDerivation rec {
name = "Write";
exec = "Write";
comment = "A word processor for handwriting";
icon = "write_stylus";
icon = desktopIcon;
desktopName = "Write";
genericName = "Write";
categories = "Office;Graphics";
@@ -18,13 +26,6 @@ stdenv.mkDerivation rec {
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 = ".";

dontBuild = true;
@@ -35,9 +36,6 @@ stdenv.mkDerivation rec {
# symlink the binary to bin/
ln -s $out/Write/Write $out/bin/Write
# untar icons
tar -xzf ${icon} *.tar.gz -C $out/
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/
'';