jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #37077 from Maxdamantus/edbrowse

Browse Source 
edbrowse: 3.6.1 -> 3.7.2
This commit is contained in:
Jörg Thalheim 2018-03-18 12:39:15 +00:00 committed by GitHub
commit 711bef7bcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/editors/edbrowse/default.nix
View File

@ -1,26 +1,24 @@
{ stdenv, fetchurl, spidermonkey, unzip, curl, pcre, readline, openssl, perl, html-tidy }: { stdenv, fetchurl, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "edbrowse-${version}"; name = "edbrowse-${version}";
version = "3.6.1"; version = "3.7.2";
nativeBuildInputs = [ unzip ]; buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
buildInputs = [ curl pcre readline openssl spidermonkey perl html-tidy ];
patchPhase = '' patchPhase = ''
substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
for i in ./tools/*.pl for i in ./tools/*.pl
do do
substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl" substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl"
done done
''; '';
NIX_CFLAGS_COMPILE = "-I${spidermonkey}/include/mozjs-31";
makeFlags = "-C src prefix=$(out)"; makeFlags = "-C src prefix=$(out)";
src = fetchurl { src = fetchurl {
url = "http://edbrowse.org/${name}.zip"; name = "${name}.tar.gz";
sha256 = "1grkn09r31nmvcnm76jkd8aclmd9n5141mpqvb86wndp9pa7gz7q"; url = "https://github.com/CMB/edbrowse/archive/v${version}.tar.gz";
sha256 = "1g9cwk4wszahk2m8k34i3rx44yhqfnv67zls0lk5g7jhrhpbf433";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Command Line Editor Browser"; description = "Command Line Editor Browser";
@ -35,6 +33,5 @@ stdenv.mkDerivation rec {
homepage = http://edbrowse.org/; homepage = http://edbrowse.org/;
maintainers = [ maintainers.schmitthenner maintainers.vrthra ]; maintainers = [ maintainers.schmitthenner maintainers.vrthra ];
platforms = platforms.linux; platforms = platforms.linux;
broken = true; # no compatible spidermonkey
}; };
} }

3
pkgs/development/interpreters/duktape/default.nix
View File

@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
install -d $out/bin install -d $out/bin
install -m755 duk $out/bin/ install -m755 duk $out/bin/
install -d $out/lib install -d $out/lib
install -m755 libduktape* $out/lib/ install -d $out/include
make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;