Author: eelco
Date: Mon Jul 18 12:39:11 2011
New Revision: 27820
URL: https://svn.nixos.org/websvn/nix/?rev=27820&sc=1
Log:
* Use callPackage.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Jul 18 12:37:50
2011 (r27819)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Jul 18 12:39:11
2011 (r27820)
@@ -6314,20 +6314,14 @@
flashplayer = flashplayer10;
- flashplayer9 = (
- import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
- inherit fetchurl stdenv zlib alsaLib nss nspr fontconfig freetype expat;
- inherit (xlibs) libX11 libXext libXrender libXt;
- inherit (gtkLibs) gtk glib pango atk;
- });
+ flashplayer9 = callPackage
../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
+ inherit (gtkLibs) atk;
+ };
- flashplayer10 = (
- import ../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
- inherit fetchurl stdenv zlib alsaLib curl nss nspr fontconfig freetype
expat cairo;
- inherit (xlibs) libX11 libXext libXrender libXt ;
- inherit (gtkLibs) gtk glib pango atk gdk_pixbuf;
- debug = getConfig ["flashplayer" "debug"] false;
- });
+ flashplayer10 = callPackage
../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
+ inherit (gtkLibs) atk gdk_pixbuf;
+ debug = getConfig ["flashplayer" "debug"] false;
+ };
freecad = callPackage ../applications/graphics/freecad {
boost = boost146;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
