all-packages: Use callPackage where possible

2015-09-14 22:27:19 -06:00
parent 7fb1c7efcf
commit eb7404d97a
64 changed files with 409 additions and 726 deletions
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ b/pkgs/data/fonts/fontWrap/default.nix
@@ -1,4 +1,5 @@
-args : with args;
+args @ { fetchurl, stdenv, builderDefs, paths, mkfontdir, mkfontscale }:
+with args;
 	let localDefs = builderDefs.passthru.function {
 		src =""; /* put a fetchurl here */
 		buildInputs = [mkfontdir mkfontscale];
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -1,4 +1,4 @@
-args: with args; rec {
+args @ { fetchurl, fontforge, lib, ... }: with args; rec {
  name = "linux-libertine-5.3.0";

  src = fetchurl {