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

Merge x-updates

Browse Source
This commit is contained in:
Vladimír Čunát
2013-12-25 23:56:41 +01:00
parent 378f962c0e 28cb01ee89
commit b80d1c5923
87 changed files with 778 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/racket/default.nix
View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf
echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf
echo "</fontconfig>" >> chroot-fontconfig/fonts.conf
export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf
cd src
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
NIX_LDFLAGS = "-lgcc_s";
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}" ;

27
pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoconf213, nspr, perl, python, readline, zip }:
{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }:
stdenv.mkDerivation rec {
version = "185-1.0.0";
@@ -11,21 +11,30 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ nspr ];
buildInputs = [ pkgconfig autoconf213 perl python readline zip ];
buildInputs = [ pkgconfig perl python zip ];
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
export LIBXUL_DIST=$out
autoconf
'';
meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = https://developer.mozilla.org/en/SpiderMonkey;
# TODO: MPL/GPL/LGPL tri-license.
maintainers = [ maintainers.goibhniu ];
};
configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ];
# hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";
enableParallelBuilding = true;
doCheck = true;
preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522
meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = https://developer.mozilla.org/en/SpiderMonkey;
# TODO: MPL/GPL/LGPL tri-license.
maintainers = [ maintainers.goibhniu ];
};
}