* Use callPackage.

svn path=/nixpkgs/trunk/; revision=27820
This commit is contained in:
Eelco Dolstra 2011-07-18 12:39:11 +00:00
parent 9c2f9fd2f2
commit dc5a3adf5f

View File

@ -6314,20 +6314,14 @@ let
flashplayer = flashplayer10; flashplayer = flashplayer10;
flashplayer9 = ( flashplayer9 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 { inherit (gtkLibs) atk;
inherit fetchurl stdenv zlib alsaLib nss nspr fontconfig freetype expat; };
inherit (xlibs) libX11 libXext libXrender libXt;
inherit (gtkLibs) gtk glib pango atk;
});
flashplayer10 = ( flashplayer10 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
import ../applications/networking/browsers/mozilla-plugins/flashplayer-10 { inherit (gtkLibs) atk gdk_pixbuf;
inherit fetchurl stdenv zlib alsaLib curl nss nspr fontconfig freetype expat cairo; debug = getConfig ["flashplayer" "debug"] false;
inherit (xlibs) libX11 libXext libXrender libXt ; };
inherit (gtkLibs) gtk glib pango atk gdk_pixbuf;
debug = getConfig ["flashplayer" "debug"] false;
});
freecad = callPackage ../applications/graphics/freecad { freecad = callPackage ../applications/graphics/freecad {
boost = boost146; boost = boost146;