diff options
Diffstat (limited to 'pkgs/applications/networking/browsers/opera')
-rw-r--r-- | pkgs/applications/networking/browsers/opera/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/opera/default.nix | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/opera/builder.sh b/pkgs/applications/networking/browsers/opera/builder.sh index 66a3388bc88d..de4a413e4ac8 100644 --- a/pkgs/applications/networking/browsers/opera/builder.sh +++ b/pkgs/applications/networking/browsers/opera/builder.sh @@ -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 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 ""); |