Now that there is *.meta.function, *Fun is redundant. Did this for libertine

svn path=/nixpkgs/trunk/; revision=11840

1 files changed, 4 insertions, 6 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27a4be0b297..ac2807be4c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4807,13 +4807,11 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
-  libertineFun = builderDefsPackage (selectVersion ../data/fonts/libertine "2.7") {
+  libertine = builderDefsPackage (selectVersion ../data/fonts/libertine "2.7") {
     inherit fontforge;
-  };
-  libertine = libertineFun null;
-  libertineBinFun = builderDefsPackage (selectVersion ../data/fonts/libertine "2.7.bin") {
-  };
-  libertineBin = libertineBinFun null;
+  } null;
+  libertineBin = builderDefsPackage (selectVersion ../data/fonts/libertine "2.7.bin") {
+  } null;
 
   lmodernFun = builderDefsPackage (selectVersion ../data/fonts/lmodern "1.010") {
   };