public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix evaluation problems.

Browse Source 
svn path=/nixpkgs/branches/x-updates/; revision=22668
This commit is contained in:
Eelco Dolstra 2010-07-19 22:24:26 +00:00
parent b8928b09fd
commit 9909fdbbd6
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libpng/default.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];
passthru = { inherit zlib; };
meta = { meta = {
description = "The official reference implementation for the PNG file format"; description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html; homepage = http://www.libpng.org/pub/png/libpng.html;

13
pkgs/top-level/all-packages.nix
View File

@ -3004,7 +3004,7 @@ let
xulrunnerWrapper = {application, launcher}: xulrunnerWrapper = {application, launcher}:
import ../development/interpreters/xulrunner/wrapper { import ../development/interpreters/xulrunner/wrapper {
inherit stdenv application launcher; inherit stdenv application launcher;
xulrunner = xulrunner35; xulrunner = firefox36Pkgs.xulrunner;
}; };
@ -7964,8 +7964,7 @@ let
inherit (xlibs) libXinerama; inherit (xlibs) libXinerama;
}; };
firefox = firefox36; firefox = firefox36Pkgs.firefox;
firefoxWrapper = firefox36Wrapper; firefoxWrapper = firefox36Wrapper;
firefox35Pkgs = import ../applications/networking/browsers/firefox/3.5.nix { firefox35Pkgs = import ../applications/networking/browsers/firefox/3.5.nix {
@ -7976,9 +7975,7 @@ let
inherit (gnome) libIDL; inherit (gnome) libIDL;
}; };
firefox35 = firefox35Pkgs.firefox; firefox35Wrapper = wrapFirefox firefox35Pkgs.firefox "firefox" "";
xulrunner35 = firefox35Pkgs.xulrunner;
firefox35Wrapper = wrapFirefox firefox35 "firefox" "";
firefox36Pkgs = import ../applications/networking/browsers/firefox/3.6.nix { firefox36Pkgs = import ../applications/networking/browsers/firefox/3.6.nix {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
@ -7988,7 +7985,7 @@ let
inherit (gnome) libIDL; inherit (gnome) libIDL;
}; };
firefox36Wrapper = lowPrio (wrapFirefox firefox36Pkgs.firefox "firefox" ""); firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
flac = import ../applications/audio/flac { flac = import ../applications/audio/flac {
inherit fetchurl stdenv libogg; inherit fetchurl stdenv libogg;
@ -8147,7 +8144,7 @@ let
gecko_mediaplayer = import ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer { gecko_mediaplayer = import ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer {
inherit fetchurl stdenv pkgconfig dbus dbus_glib x11 gnome_mplayer MPlayer glib; inherit fetchurl stdenv pkgconfig dbus dbus_glib x11 gnome_mplayer MPlayer glib;
inherit (gnome) GConf; inherit (gnome) GConf;
browser = firefox35; browser = firefox;
}; };
geeqie = import ../applications/graphics/geeqie { geeqie = import ../applications/graphics/geeqie {