synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29531
This commit is contained in:
Peter Simons
parent
07a5a121fb
commit
e460e459bf
@ -1,39 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
buildPhase() {
|
||||
true
|
||||
}
|
||||
|
||||
installPhase() {
|
||||
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.
|
||||
|
||||
ensureDir "$out"
|
||||
|
||||
./install --text --system
|
||||
|
||||
[ -z ${system##*64*} ] && suf=64
|
||||
|
||||
find $out -type f | while read f; do
|
||||
echo testing "$f"
|
||||
# patch all executables
|
||||
if readelf -h "$f" | grep 'EXEC (Executable file)' &> /dev/null; then
|
||||
echo "patching $f <<"
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "$libPath" \
|
||||
"$f"
|
||||
fi
|
||||
done
|
||||
|
||||
# Substitute pwd as late as possible so that the md5 checksum check of opera passes.
|
||||
substituteInPlace $out/bin/opera --replace /bin/pwd pwd
|
||||
|
||||
ensureDir $out/share/applications
|
||||
cp $desktopItem/share/applications/* $out/share/applications
|
||||
}
|
||||
|
||||
genericBuild
|
||||
@ -1,46 +1,81 @@
|
||||
{ stdenv, fetchurl, qt, zlib, libX11, libXext, libSM, libICE, libXt, glibc
|
||||
, makeDesktopItem, freetype, fontconfig, libXft, libXrender
|
||||
{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt
|
||||
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
|
||||
, libuuid, cups, xz
|
||||
, gstreamer, gstPluginsBase, libxml2
|
||||
, gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk
|
||||
, kdeSupport ? false, qt4, kdelibs
|
||||
}:
|
||||
|
||||
assert stdenv.isLinux && stdenv.gcc.gcc != null;
|
||||
assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null;
|
||||
|
||||
let
|
||||
mirror = ftp://ftp.ussg.iu.edu/pub/opera;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opera-10.63";
|
||||
name = "opera-11.51-1087";
|
||||
|
||||
builder = ./builder.sh;
|
||||
buildNativeInputs = [ xz ];
|
||||
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://mirror.liteserver.nl/pub/opera/linux/1063/opera-10.63-6450.i386.linux.tar.bz2";
|
||||
sha256 = "dd105d602a4b8897749a4cb9610f8bfe2d07d4f4cc9bf3905930c65592737259";
|
||||
url = "${mirror}/linux/1151/${name}.i386.linux.tar.bz2";
|
||||
sha256 = "1baaim404g8nwd7knbl1p1ardpx36ib5159nkvqfnnavfyhkinp2";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://mirror.liteserver.nl/pub/opera/linux/1063/opera-10.63-6450.x86_64.linux.tar.bz2";
|
||||
sha256 = "da8ae14cf317364ab0295102220246b205bf30c59c00cadb571395c90dda7c74";
|
||||
url = "${mirror}/linux/1151/${name}.x86_64.linux.tar.xz";
|
||||
sha256 = "1bciqyfhhdywaasj717by1a975ywf672r3pv9cw9bn0b90pgp933";
|
||||
}
|
||||
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
|
||||
|
||||
dontStrip = 1;
|
||||
|
||||
# `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 libXft freetype fontconfig
|
||||
libXrender];
|
||||
in stdenv.lib.makeLibraryPath list
|
||||
+ ":" + (if stdenv.system == "x86_64-linux" then stdenv.lib.makeSearchPath "lib64" list else "");
|
||||
phases = "unpackPhase installPhase fixupPhase";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Opera";
|
||||
exec = "opera";
|
||||
icon = "opera";
|
||||
comment = "Opera Web Browser";
|
||||
desktopName = "Opera";
|
||||
genericName = "Web Browser";
|
||||
categories = "Application;Network;";
|
||||
};
|
||||
installPhase = ''
|
||||
./install --unattended --prefix $out
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
[ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE
|
||||
libXft freetype fontconfig libXrender libuuid expat
|
||||
gstreamer libxml2 gstPluginsBase
|
||||
]
|
||||
++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ]
|
||||
++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ];
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath buildInputs
|
||||
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
|
||||
(":" + stdenv.lib.makeSearchPath "lib64" buildInputs);
|
||||
|
||||
preFixup =
|
||||
''
|
||||
find $out/lib/opera -type f | while read f; do
|
||||
type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
|
||||
if [ -z "$type" ]; then
|
||||
:
|
||||
elif [ $type == "EXEC" ]; then
|
||||
echo "patching $f executable <<"
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${libPath}" \
|
||||
"$f"
|
||||
elif [ $type == "DYN" ]; then
|
||||
echo "patching $f library <<"
|
||||
patchelf --set-rpath "${libPath}" "$f"
|
||||
else
|
||||
echo "Unknown type $type"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
oldRPATH=`patchelf --print-rpath $out/lib/opera/opera`
|
||||
patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.opera.com;
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ cabal, deepseq, mtl, mwcRandom, parsec, statistics, time, vector
|
||||
, vectorAlgorithms
|
||||
{ cabal, aeson, deepseq, mtl, mwcRandom, parsec, statistics, time
|
||||
, vector, vectorAlgorithms
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "criterion";
|
||||
version = "0.5.0.10";
|
||||
sha256 = "0sd289s7wnyg0p37j327hv55aw4a18bdv56z26v4qi3j8p2fbpbj";
|
||||
version = "0.5.1.0";
|
||||
sha256 = "0v43dm1d84zvn32q89dq0nh4dvqr4r6fjdzwcjac0mjics3iy29d";
|
||||
buildDepends = [
|
||||
deepseq mtl mwcRandom parsec statistics time vector
|
||||
aeson deepseq mtl mwcRandom parsec statistics time vector
|
||||
vectorAlgorithms
|
||||
];
|
||||
meta = {
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "happstack-util";
|
||||
version = "6.0.0";
|
||||
sha256 = "06qla74kb58q0rvlfa9k16s4crnylq99hm80xx4phlddyzn0cy4z";
|
||||
version = "6.0.2";
|
||||
sha256 = "03qlnclpg72iflry1xlkd0sxqm6nybvx113la9r0cmsnz17y546a";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "icu4c";
|
||||
version = "4.6";
|
||||
version = "4.8.1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
src = fetchurl {
|
||||
url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
|
||||
+ (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
|
||||
sha256 = "1z6zklqdf6pq7fckk8ar4vmfrnw79bih6yc8gwc7k2vx2alav8dm";
|
||||
sha256 = "13zq190gl54zr84f0k48w9knarjsb966jkailyy06yhqjipcv90r";
|
||||
};
|
||||
|
||||
postUnpack = "
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hlint";
|
||||
version = "1.8.15";
|
||||
sha256 = "1hi2qapi8lb7cawjzvpknp8qvsnfw3glxyyd5m2lbp3rvkx0d6kr";
|
||||
version = "1.8.16";
|
||||
sha256 = "0crahq7fvhf0qvjcpjnmv5yh29l52cv7rgfwrc6ka4q0dm9r49vb";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -7069,7 +7069,9 @@ let
|
||||
};
|
||||
|
||||
opera = callPackage ../applications/networking/browsers/opera {
|
||||
qt = qt3;
|
||||
inherit (pkgs.gtkLibs) gdk_pixbuf atk;
|
||||
inherit (pkgs.kde4) kdelibs;
|
||||
inherit (pkgs.gst_all) gstreamer gstPluginsBase;
|
||||
};
|
||||
|
||||
pan = callPackage ../applications/networking/newsreaders/pan {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user