mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Fix Opera update
svn path=/nixpkgs/trunk/; revision=25134
This commit is contained in:
parent
24640ac0ec
commit
da5fd5c100
@ -5,11 +5,15 @@ buildPhase() {
|
||||
}
|
||||
|
||||
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
|
||||
# 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
|
||||
|
||||
|
@ -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 "");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user