about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-06 10:03:42 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-06 10:03:42 +0100
commit782a12e450a58b815cd702c65da75855124d1572 (patch)
tree34136b20e3f9a21040efa2c818160223ba658edf /pkgs
parent9a7143918bab8609338676e5053589099387cba1 (diff)
Revert "Update Liberation fonts"
This reverts commit e85f67f21563756be494ad938bdfc5bf068c7ef0. It makes
NixOS depend on Atlas, gfortran, numpy, etc. In particular nothing
importation should ever gepend on Atlas, because it's prone to random
build failures:

  http://hydra.nixos.org/build/16766850
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/data/fonts/redhat-liberation-fonts/default.nix13
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index f8dca0fd5a3de..81de83aecef36 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -1,20 +1,19 @@
-{stdenv, fetchurl, fontforge, python, pythonPackages}:
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "liberation-fonts-2.00.1";
+  name = "liberation-fonts-1.04";
+
   src = fetchurl {
     url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz";
-    sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
+    sha256 = "189i6pc4jqhhmsb9shi8afg9af9crpmz9bnlldhqaxavr1bhj38f";
   };
 
-  buildInputs = [fontforge python pythonPackages.fonttools];
-
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
-    cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
+    cp -v *.ttf $out/share/fonts/truetype
 
     mkdir -p "$out/doc/${name}"
-    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
+    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}"
   '';
 
   meta = {