diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-12-14 20:32:49 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-12-14 20:32:49 +0000 |
| commit | da5fd5c100b05a46e840713679c93c8e29ef4cd9 (patch) | |
| tree | d828ea61da0ff2b799f58f72fc65b12211c783b2 /pkgs/applications/networking/browsers/opera/default.nix | |
| parent | 24640ac0ec77c9c13b940920a4ec1c60410c224b (diff) | |
| download | nixlib-da5fd5c100b05a46e840713679c93c8e29ef4cd9.tar nixlib-da5fd5c100b05a46e840713679c93c8e29ef4cd9.tar.gz nixlib-da5fd5c100b05a46e840713679c93c8e29ef4cd9.tar.bz2 nixlib-da5fd5c100b05a46e840713679c93c8e29ef4cd9.tar.lz nixlib-da5fd5c100b05a46e840713679c93c8e29ef4cd9.tar.xz nixlib-da5fd5c100b05a46e840713679c93c8e29ef4cd9.tar.zst nixlib-da5fd5c100b05a46e840713679c93c8e29ef4cd9.zip | |
Fix Opera update
svn path=/nixpkgs/trunk/; revision=25134
Diffstat (limited to 'pkgs/applications/networking/browsers/opera/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/opera/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 543997160e53..8b7ef628044f 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, qt, zlib, libX11, libXext, libSM, libICE, libXt, glibc -, makeDesktopItem +, makeDesktopItem, freetype, fontconfig, libXft, libXrender }: assert stdenv.isLinux && stdenv.gcc.gcc != null; @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { # `operapluginwrapper' requires libXt. Adding it makes startup faster # and omits error messages (on x86). libPath = - let list = [ stdenv.gcc.gcc glibc qt zlib libX11 libXt libXext libSM libICE]; + let list = [ stdenv.gcc.gcc glibc qt zlib libX11 libXt libXext libSM libICE libXft freetype fontconfig + libXrender]; in stdenv.lib.makeLibraryPath list + ":" + (if stdenv.system == "x86_64-linux" then stdenv.lib.makeSearchPath "lib64" list else ""); |