summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-10-06 15:24:20 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-10-06 15:24:20 +0200
commit741bf840dad05cd1728481045466811ae8ae8281 (patch)
tree93ce9aef00773772dfb9b782f20e20b79f024d48 /pkgs/data
parentfe195af94462a6769f2e2c38c1d5739337c20d57 (diff)
downloadnixlib-741bf840dad05cd1728481045466811ae8ae8281.tar
nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.gz
nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.bz2
nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.lz
nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.xz
nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.zst
nixlib-741bf840dad05cd1728481045466811ae8ae8281.zip
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing
changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/symbola/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix
index 253fd9cd3e98..5b2113dc57e8 100644
--- a/pkgs/data/fonts/symbola/default.nix
+++ b/pkgs/data/fonts/symbola/default.nix
@@ -5,7 +5,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://users.teilar.gr/~g1951d/Symbola.zip";
-    sha256 = "1lfs2j816332ysvpb5ibj2gwpmyqyispqdl7skkshf2gra18hmhd";
+    sha256 = "07bczpl3vqdpg2gakfddhzzgpb6v2wpasv7rwqxkyg9yd9lmbr0s";
+  };
+  docs_pdf = fetchurl {
+    url = "http://users.teilar.gr/~g1951d/Symbola.pdf";
+    sha256 = "1zmq1ijl0k5hrc6vpa2xp9n1x2zrrd7ng3jwc9yf0qsi3pmkpk0p";
   };
 
   buildInputs = [ unzip ];
@@ -20,7 +24,8 @@ stdenv.mkDerivation rec {
 
     mkdir -p "$out/doc/${name}"
     cp -v Symbola.docx "$out/doc/${name}/"
-    cp -v Symbola.pdf "$out/doc/${name}/"
+    cp -v Symbola.htm "$out/doc/${name}/"
+    cp -v "$docs_pdf" "$out/doc/${name}/${docs_pdf.name}"
   '';
 
   meta = {