diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 11:55:54 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 11:55:54 +0000 |
commit | 66097104090e06c43a784193809bc8843a2ec052 (patch) | |
tree | 021d726cde3c2dec5d4341340b37589feef3b15c /pkgs/development/interpreters/spidermonkey | |
parent | b4a3f99c7812a6c8bc34979200693b7010afffcc (diff) |
* Get rid of many instances of "args: with args;", and other coding
guidelines violations. * Updated libsamplerate to 0.1.7. svn path=/nixpkgs/trunk/; revision=22782
Diffstat (limited to 'pkgs/development/interpreters/spidermonkey')
-rw-r--r-- | pkgs/development/interpreters/spidermonkey/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix index 97b9115b756df..b63b38ebf29c3 100644 --- a/pkgs/development/interpreters/spidermonkey/default.nix +++ b/pkgs/development/interpreters/spidermonkey/default.nix @@ -1,10 +1,11 @@ -args: with args; +{ stdenv, fetchurl, readline }: stdenv.mkDerivation rec { name = "spidermonkey-1.7"; + src = fetchurl { url = ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz; - sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4"; + sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4"; }; buildInputs = [ readline ]; @@ -13,8 +14,12 @@ stdenv.mkDerivation rec { makefileExtra = ./Makefile.extra; makefile = "Makefile.ref"; - patchPhase = "cat ${makefileExtra} >> ${makefile}; - sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}"; + + patchPhase = + '' + cat ${makefileExtra} >> ${makefile} + sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile} + ''; - makeFlags="-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1"; + makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1"; } |