nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Opera update

Browse Source 
svn path=/nixpkgs/trunk/; revision=25134
This commit is contained in:
Michael Raskin 2010-12-14 20:32:49 +00:00
parent 24640ac0ec
commit da5fd5c100
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/opera/builder.sh
View File

@ -5,11 +5,15 @@ buildPhase() {
} }
installPhase() { installPhase() {
substituteInPlace install.sh --replace /bin/pwd pwd substituteInPlace install --replace /bin/pwd pwd
substituteInPlace install --replace /usr/local "$out"
# Note: the "no" is because the install scripts asks whether we # Note: the "no" is because the install scripts asks whether we
# want to install icons in some system-wide directories. # want to install icons in some system-wide directories.
echo no | ./install.sh --prefix=$out
ensureDir "$out"
./install --text --system
[ -z ${system##*64*} ] && suf=64 [ -z ${system##*64*} ] && suf=64

5
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, qt, zlib, libX11, libXext, libSM, libICE, libXt, glibc { stdenv, fetchurl, qt, zlib, libX11, libXext, libSM, libICE, libXt, glibc
, makeDesktopItem , makeDesktopItem, freetype, fontconfig, libXft, libXrender
}: }:
assert stdenv.isLinux && stdenv.gcc.gcc != null; assert stdenv.isLinux && stdenv.gcc.gcc != null;
@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
# `operapluginwrapper' requires libXt. Adding it makes startup faster # `operapluginwrapper' requires libXt. Adding it makes startup faster
# and omits error messages (on x86). # and omits error messages (on x86).
libPath = 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 in stdenv.lib.makeLibraryPath list
+ ":" + (if stdenv.system == "x86_64-linux" then stdenv.lib.makeSearchPath "lib64" list else ""); + ":" + (if stdenv.system == "x86_64-linux" then stdenv.lib.makeSearchPath "lib64" list else "");