diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-22 15:59:42 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-22 15:59:42 +0100 |
| commit | 3fe32b675e1605cbc830fa52c0593747fa4dd7e2 (patch) | |
| tree | e0b31e2df8f0734290232b1b0d61d0716731e296 /pkgs/development/interpreters | |
| parent | a903c60c627f42461d3e6f9780d26a80f8e51470 (diff) | |
| parent | b7d4a356be49501ea046b28db28dc2807f5fccdb (diff) | |
| download | nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.gz nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.bz2 nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.lz nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.xz nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.zst nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/mujs/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/interpreters/racket/default.nix | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index c7663a116763..918b2c2515e2 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchgit, clang }: +{ stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "mujs-2017-01-24"; + name = "mujs-${version}"; + version = "1.0.5"; - src = fetchgit { - url = git://git.ghostscript.com/mujs.git; - rev = "4006739a28367c708dea19aeb19b8a1a9326ce08"; - sha256 = "0wvjl8lkh0ga6fkmxgjqq77yagncbv1bdy6hpnxq31x3mkwn1s51"; + src = fetchurl { + url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; + sha256 = "02cqrfnww2s3ylcvqin1951f2c5nzpby8gxb207p2hbrivbg8f0l"; }; - buildInputs = [ clang ]; + buildInputs = [ readline ]; makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { homepage = http://mujs.com/; description = "A lightweight, embeddable Javascript interpreter"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 15536c6370a3..efe14da5834f 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { mkdir src/build cd src/build - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" $LD_LIBRARY_PATH) + gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) ''; shared = if stdenv.isDarwin then "dylib" else "shared"; |