diff options
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/clearlyU/1.9.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/junicode/0.6.15.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/libertine/2.7.bin.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/libertine/2.7.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/lmodern/0.92.nix | 32 | ||||
-rw-r--r-- | pkgs/data/fonts/lmodern/default.nix (renamed from pkgs/data/fonts/lmodern/1.010.nix) | 18 | ||||
-rw-r--r-- | pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix | 2 |
7 files changed, 12 insertions, 48 deletions
diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix index 6d2b9ffb812..69296a45c24 100644 --- a/pkgs/data/fonts/clearlyU/1.9.nix +++ b/pkgs/data/fonts/clearlyU/1.9.nix @@ -18,7 +18,7 @@ args : with args; with builderDefs; }); in with localDefs; stdenv.mkDerivation rec { - name = "clearlyU-12-"+version; + name = "clearlyU-12-1.9"; builder = writeScript (name + "-builder") (textClosure localDefs [doInstall doForceShare doPropagate]); diff --git a/pkgs/data/fonts/junicode/0.6.15.nix b/pkgs/data/fonts/junicode/0.6.15.nix index 1a8497bebb7..f991a387976 100644 --- a/pkgs/data/fonts/junicode/0.6.15.nix +++ b/pkgs/data/fonts/junicode/0.6.15.nix @@ -16,7 +16,7 @@ args : with args; with builderDefs; }); in with localDefs; stdenv.mkDerivation rec { - name = "junicode-"+version; + name = "junicode-0.6.15"; builder = writeScript (name + "-builder") (textClosure localDefs [doInstall doForceShare doPropagate]); diff --git a/pkgs/data/fonts/libertine/2.7.bin.nix b/pkgs/data/fonts/libertine/2.7.bin.nix index c88659e4371..b4e8bb9b6d1 100644 --- a/pkgs/data/fonts/libertine/2.7.bin.nix +++ b/pkgs/data/fonts/libertine/2.7.bin.nix @@ -8,7 +8,7 @@ rec{ buildInputs = []; phaseNames = ["doUnpack" "installFonts"]; - name = "linux-libertine-" + version; + name = "linux-libertine-2.7"; meta = { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; diff --git a/pkgs/data/fonts/libertine/2.7.nix b/pkgs/data/fonts/libertine/2.7.nix index 546a4bdacec..a5c212aff86 100644 --- a/pkgs/data/fonts/libertine/2.7.nix +++ b/pkgs/data/fonts/libertine/2.7.nix @@ -15,7 +15,7 @@ rec { ScaleToEm(1000); ''; - name = "linux-libertine-" + version; + name = "linux-libertine-2.7"; meta = { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; 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/default.nix index 6948fa4cbbe..c95b409ed8e 100644 --- a/pkgs/data/fonts/lmodern/1.010.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,25 +1,21 @@ -args : with args; -rec { +{ 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"; }; - buildInputs = []; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["doCopy"]; - - doCopy = fullDepEntry('' + installPhase = '' 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/wqy_zenhei/0.4.23-1.nix b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix index edf9f8c40ff..4b6120ad108 100644 --- a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix +++ b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix @@ -15,7 +15,7 @@ args : with args; with builderDefs; }); in with localDefs; stdenv.mkDerivation rec { - name = "wqy-zenhei-"+version; + name = "wqy-zenhei-0.4.23-1"; builder = writeScript (name + "-builder") (textClosure localDefs [doInstall doForceShare doPropagate]); |