diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-10-09 20:45:55 +0300 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2020-10-09 20:47:45 +0300 |
| commit | 0da82de388a5214522262a3885080bad1c02fd1b (patch) | |
| tree | c33e736bdd7e5ac5ece6d76ad11d876246c031fc /pkgs/servers/http | |
| parent | a4bbb8a5afda47496be6d37a0b81cb25f054eb09 (diff) | |
treewide: Use spidermonkey_68 explicitly
A fix for #100089 which caused ofborg eval errors on all PRs due to
usage of aliases in couchdb and mediatomb.
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/couchdb/2.0.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/couchdb/3.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/couchdb/default.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index 3f6f00e1bdbf..8396e3511ec4 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))]; + buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; patches = [ ./jsapi.patch ]; postPatch = '' diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index 3716afae4906..18271e82a8f9 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1vgqj3zsrkdqgnwzji3mqkapnfd6kq466f5xnya0fvzzl6bcfrs8"; }; - buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))]; + buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; postPatch = '' - substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey.dev}/include/mozjs-68" + substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey_68.dev}/include/mozjs-68" patchShebangs bin/rebar ''; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index b8807532181a..07f353e87493 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68, curl, help2man , sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ help2man which file pkgconfig sphinx ]; - buildInputs = [ erlang icu openssl spidermonkey curl ]; + buildInputs = [ erlang icu openssl spidermonkey_68 curl ]; postInstall = '' substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt" |