cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

couchdb: revert changes from 0da82de388

Browse source 
These changes break evaluation and they frankly don't look correct here.
This commit is contained in:
Peter Simons 2020-10-09 20:50:43 +02:00
parent 913923c07c
commit 143650958c
3 changed files with 7 additions and 7 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_68
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey
, coreutils, bash, makeWrapper, python3 }:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))];
buildInputs = [ erlang icu openssl spidermonkey (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_68
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey
, coreutils, bash, makeWrapper, python3 }:
stdenv.mkDerivation rec {
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "1vgqj3zsrkdqgnwzji3mqkapnfd6kq466f5xnya0fvzzl6bcfrs8";
};
buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))];
buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))];
postPatch = ''
substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey_68.dev}/include/mozjs-68"
substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey.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_68, curl, help2man
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, 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_68 curl ];
buildInputs = [ erlang icu openssl spidermonkey curl ];
postInstall = ''
substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt"