diff options
| author | Roelof Wobben <rwobben@hotmail.com> | 2013-11-30 20:33:46 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-11-30 22:46:39 +0100 |
| commit | 808603852a24e82a6cfc1e8c15d0b1469a30a7b5 (patch) | |
| tree | 34756afce1cc18d214da3894cb9f866a1b6a438e /pkgs/desktops/cinnamon | |
| parent | f668fd37dff914fdfd310002ac59fbaed9faefa8 (diff) | |
cjs is working with the new mozjs185
Diffstat (limited to 'pkgs/desktops/cinnamon')
| -rw-r--r-- | pkgs/desktops/cinnamon/cjs.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch | 24 |
2 files changed, 2 insertions, 27 deletions
diff --git a/pkgs/desktops/cinnamon/cjs.nix b/pkgs/desktops/cinnamon/cjs.nix index 2e5f261b2860..63edc07a7a68 100644 --- a/pkgs/desktops/cinnamon/cjs.nix +++ b/pkgs/desktops/cinnamon/cjs.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, python -, dbus_glib, cairo, spidermonkey_185 }: +, dbus_glib, cairo, spidermonkey_185, gobjectIntrospection}: stdenv.mkDerivation rec { name = "cjs"; @@ -13,10 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig autoreconfHook python dbus_glib cairo spidermonkey_185 + gobjectIntrospection ]; - patches = [ ./fix_configure_ac_gobject.patch]; - preBuild = "patchShebangs ./scripts"; meta = { diff --git a/pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch b/pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch deleted file mode 100644 index 454dde18797e..000000000000 --- a/pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch +++ /dev/null @@ -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 - |