From 7f5b839524cad9211699c68ea02d11c1758a800b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Nov 2009 09:39:59 +0000
Subject: * Removed selectVersion.  There's no good reason to write  
 `selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'. * Replaced
 `with args' with formal function arguments in several   packages. * Renamed
 several files to `default.nix'.  As a general rule, version   numbers should
 only be included in the filename when there is a   reason to keep multiple
 versions of a package in Nixpkgs.   Otherwise, it just makes it harder to
 update the package.

svn path=/nixpkgs/trunk/; revision=18403
---
 pkgs/data/fonts/lmodern/0.92.nix    | 32 --------------------------------
 pkgs/data/fonts/lmodern/1.010.nix   | 27 ---------------------------
 pkgs/data/fonts/lmodern/default.nix | 23 +++++++++++++++++++++++
 3 files changed, 23 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/data/fonts/lmodern/0.92.nix
 delete mode 100644 pkgs/data/fonts/lmodern/1.010.nix
 create mode 100644 pkgs/data/fonts/lmodern/default.nix

(limited to 'pkgs/data/fonts/lmodern')

diff --git a/pkgs/data/fonts/lmodern/0.92.nix b/pkgs/data/fonts/lmodern/0.92.nix
deleted file mode 100644
index 556b9f99876..00000000000
--- a/pkgs/data/fonts/lmodern/0.92.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/l/lmodern/lmodern_0.92.orig.tar.gz;
-    sha256 = "0ak3n7fsi2va94gsn0pfmyby2b4g7wz9h5a0prpbx24ax1xwinls";
-  };
-
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doCopy"];
-
-  doCopy = fullDepEntry(''
-    ensureDir $out/share/texmf/fonts/enc 
-    ensureDir $out/share/texmf/fonts/map 
-    ensureDir $out/share/texmf/fonts/type1/public/lm 
-    ensureDir $out/share/texmf/dvips/lm 
-    ensureDir $out/share/texmf/dvipdfm/config
-
-    cp -r ./* $out/share/texmf/
-
-    cp dvips/lm/*.enc $out/share/texmf/fonts/enc
-    cp dvips/lm/*.map $out/share/texmf/fonts/map
-    cp dvips/lm/*.map $out/share/texmf/dvipdfm/config
-  '') ["minInit" "defEnsureDir" "doUnpack"];
-
-  name = "lmodern-" + version;
-  meta = {
-    description = "Latin Modern font";
-  };
-}
diff --git a/pkgs/data/fonts/lmodern/1.010.nix b/pkgs/data/fonts/lmodern/1.010.nix
deleted file mode 100644
index 6948fa4cbbe..00000000000
--- a/pkgs/data/fonts/lmodern/1.010.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/l/lmodern/lmodern_1.010x.orig.tar.gz;
-    sha256 = "0nwxj1ng7rvnp16jxcs25hbc5in65mdk4a3g3rlaq91i5qpq7mxj";
-  };
-
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doCopy"];
-
-  doCopy = fullDepEntry(''
-    ensureDir $out/share/texmf/
-    ensureDir $out/share/fonts/
-
-    cp -r ./* $out/share/texmf/
-    cp -r fonts/{opentype,type1} $out/share/fonts/
-  '') ["minInit" "defEnsureDir" "doUnpack"];
-
-  name = "lmodern-" + version;
-  meta = {
-    description = "Latin Modern font";
-  };
-}
-
diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix
new file mode 100644
index 00000000000..c95b409ed8e
--- /dev/null
+++ b/pkgs/data/fonts/lmodern/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "lmodern-1.010x";
+  
+  src = fetchurl {
+    url = http://ftp.de.debian.org/debian/pool/main/l/lmodern/lmodern_1.010x.orig.tar.gz;
+    sha256 = "0nwxj1ng7rvnp16jxcs25hbc5in65mdk4a3g3rlaq91i5qpq7mxj";
+  };
+
+  installPhase = ''
+    ensureDir $out/share/texmf/
+    ensureDir $out/share/fonts/
+
+    cp -r ./* $out/share/texmf/
+    cp -r fonts/{opentype,type1} $out/share/fonts/
+  '';
+
+  meta = {
+    description = "Latin Modern font";
+  };
+}
+
-- 
cgit 1.4.1