treewide: don't use spidermonkey attr
This commit is contained in:
parent
b89c851737
commit
7b5864db17
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68
|
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5
|
||||||
, coreutils, bash, makeWrapper, python3 }:
|
, coreutils, bash, makeWrapper, python3 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))];
|
buildInputs = [ erlang icu openssl spidermonkey_1_8_5 (python3.withPackages(ps: with ps; [ requests ]))];
|
||||||
|
|
||||||
patches = [ ./jsapi.patch ];
|
patches = [ ./jsapi.patch ];
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68, curl, help2man
|
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man
|
||||||
, sphinx, which, file, pkgconfig, getopt }:
|
, sphinx, which, file, pkgconfig, getopt }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ help2man which file pkgconfig sphinx ];
|
nativeBuildInputs = [ help2man which file pkgconfig sphinx ];
|
||||||
buildInputs = [ erlang icu openssl spidermonkey_68 curl ];
|
buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt"
|
substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchgit
|
{ 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 }:
|
, pkgconfig, autoreconfHook }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd";
|
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 ];
|
pkgconfig autoreconfHook ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
@ -16418,18 +16418,15 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
couchdb = callPackage ../servers/http/couchdb {
|
couchdb = callPackage ../servers/http/couchdb {
|
||||||
spidermonkey = spidermonkey_1_8_5;
|
|
||||||
sphinx = python27Packages.sphinx;
|
sphinx = python27Packages.sphinx;
|
||||||
erlang = erlangR19;
|
erlang = erlangR19;
|
||||||
};
|
};
|
||||||
|
|
||||||
couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {
|
couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {
|
||||||
spidermonkey = spidermonkey_1_8_5;
|
|
||||||
erlang = erlangR21;
|
erlang = erlangR21;
|
||||||
};
|
};
|
||||||
|
|
||||||
couchdb3 = callPackage ../servers/http/couchdb/3.nix {
|
couchdb3 = callPackage ../servers/http/couchdb/3.nix {
|
||||||
spidermonkey = spidermonkey_68;
|
|
||||||
erlang = erlangR22;
|
erlang = erlangR22;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue