mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

treewide: Use spidermonkey_68 explicitly

Browse source 
A fix for #100089 which caused ofborg eval errors on all PRs due to
usage of aliases in couchdb and mediatomb.
This commit is contained in:
Doron Behar 2020-10-09 20:45:55 +03:00
parent a4bbb8a5af
commit 0da82de388
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/http/couchdb/2.0.0.nix
View file

@ -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 = ''

6
pkgs/servers/http/couchdb/3.nix
View file

@ -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
'';

4
pkgs/servers/http/couchdb/default.nix
View file

@ -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"

4
pkgs/servers/mediatomb/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchgit
, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg_3, file
, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg_3, file
, pkgconfig, autoreconfHook }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd";
};
buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg_3 file mp4v2 flac
buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg_3 file mp4v2 flac
pkgconfig autoreconfHook ];
meta = with stdenv.lib; {