MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

* Wrapped Firefox: make it evaluate on x86_64-linux.

Browse source 
svn path=/nixpkgs/trunk/; revision=8707
This commit is contained in:
Eelco Dolstra 2007-05-16 14:34:27 +00:00
parent d4f3016e10
commit ffa7b32970
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
View file

@ -1,5 +1,7 @@
{stdenv, fetchurl, zlib, alsaLib}:
assert stdenv.system == "i686-linux";
(stdenv.mkDerivation {
name = "flashplayer-9.0.31.0";

8
pkgs/top-level/all-packages.nix
View file

@ -166,6 +166,8 @@ rec {
meta = (if drv ? meta then drv.meta else {}) // {priority = "10";};
};
optional = cond: elem: if cond then [elem] else [];
### STANDARD ENVIRONMENT
@ -2959,11 +2961,11 @@ rec {
inherit stdenv firefox;
plugins = [
MPlayerPlugin
flashplayer
]
++ optional (system == "i686-linux") flashplayer
# RealPlayer is disabled by default for legal reasons.
++ (if getConfig ["firefox" "enableRealPlayer"] false then [RealPlayer] else [])
++ (if supportsJDK then [jrePlugin] else []);
++ optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer
++ optional (supportsJDK && jrePlugin ? mozillaPlugin) jrePlugin;
};
xara = import ../applications/graphics/xara {