public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #1699: firefox-27.0 and nss-3.15.4

Browse Source
This commit is contained in:
Vladimír Čunát 2014-02-08 12:13:40 +01:00
commit 4b5cfa6574
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec { rec {
firefoxVersion = "26.0"; firefoxVersion = "27.0";
xulVersion = "26.0"; # this attribute is used by other packages xulVersion = "27.0"; # this attribute is used by other packages
src = fetchurl { src = fetchurl {
@ -29,7 +29,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org. # Fall back to this url for versions not available at releases.mozilla.org.
"http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
]; ];
sha1 = "f7c6642d6f62aea8d4eced48dd27aba0634edcd5"; sha1 = "ec2031385237e30be829817ac79caa8e80cc2a14";
}; };
commonConfigureFlags = commonConfigureFlags =
@ -162,13 +162,20 @@ rec {
"SYSTEM_LIBXUL=1" "SYSTEM_LIBXUL=1"
]; ];
# Hack to work around make's idea of -lbz2 dependency # Because preConfigure runs configure from a subdirectory.
configureScript = "../configure";
preConfigure = preConfigure =
'' ''
# Hack to work around make's idea of -lbz2 dependency
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":" stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';' }' ';'
# Building directly in the main source directory is not allowed.
mkdir obj_dir
cd obj_dir
''; '';
postInstall = postInstall =

2
pkgs/applications/video/gnash/default.nix
View File

@ -81,6 +81,8 @@ stdenv.mkDerivation rec {
echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'" echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
''; '';
postConfigure = "echo '#define nullptr NULL' >> gnashconfig.h";
# Make sure `gtk-gnash' gets `libXext' in its `RPATH'. # Make sure `gtk-gnash' gets `libXext' in its `RPATH'.
NIX_LDFLAGS="-lX11 -lXext"; NIX_LDFLAGS="-lX11 -lXext";

10
pkgs/development/libraries/nss/default.nix
View File

@ -5,17 +5,17 @@
let let
nssPEM = fetchurl { nssPEM = fetchurl {
url = http://dev.gentoo.org/~anarchy/patches/nss-3.15-pem-support-20130617.patch.xz; url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "1k1m8lsgqwxx251943hks1dd13hz1adpqqb0hxwn011by5vmi201"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "nss-${version}"; name = "nss-${version}";
version = "3.15.3.1"; version = "3.15.4";
src = fetchurl { src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_3_1_RTM/src/${name}.tar.gz"; url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_4_RTM/src/${name}.tar.gz";
sha1 = "4e0f81a1f770447dc5440201a579151b601463e2"; sha1 = "c164fac83fcbaff010786767e2a858ca23a89a5b";
}; };
buildInputs = [ nspr perl zlib sqlite ]; buildInputs = [ nspr perl zlib sqlite ];