cjs is working with the new mozjs185
This commit is contained in:
parent
f668fd37df
commit
808603852a
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, autoreconfHook, python
|
{ stdenv, fetchurl, pkgconfig, autoreconfHook, python
|
||||||
, dbus_glib, cairo, spidermonkey_185 }:
|
, dbus_glib, cairo, spidermonkey_185, gobjectIntrospection}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "cjs";
|
name = "cjs";
|
||||||
@ -13,10 +13,9 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig autoreconfHook python
|
pkgconfig autoreconfHook python
|
||||||
dbus_glib cairo spidermonkey_185
|
dbus_glib cairo spidermonkey_185
|
||||||
|
gobjectIntrospection
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [ ./fix_configure_ac_gobject.patch];
|
|
||||||
|
|
||||||
preBuild = "patchShebangs ./scripts";
|
preBuild = "patchShebangs ./scripts";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1,24 +0,0 @@
|
|||||||
From cf9d3296fa1077474415e248c43e3acdebef46af Mon Sep 17 00:00:00 2001
|
|
||||||
From: Roelof Wobben <rwobben@hotmail.com>
|
|
||||||
Date: Sat, 30 Nov 2013 17:02:27 +0100
|
|
||||||
Subject: [PATCH] fix
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.ac | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 4b34c01..34ab7f5 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -11,6 +11,7 @@ AC_INIT([cjs], pkg_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=cjs
|
|
||||||
AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
|
|
||||||
AC_CONFIG_SRCDIR([cjs/console.c])
|
|
||||||
AC_CONFIG_HEADER([config.h])
|
|
||||||
+AC_CONFIG_MACRO_DIR([m4])
|
|
||||||
|
|
||||||
GETTEXT_PACKAGE=cjs
|
|
||||||
AC_SUBST([GETTEXT_PACKAGE])
|
|
||||||
--
|
|
||||||
1.8.4.3
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user