git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75680 from mkg20001/pkg/cjs

cinnamon.cjs: init at 4.4.0

commit21b6279c9fdf35a9282fce7140a51d39768430ce authorworldofpeace <worldofpeace@protonmail.ch> dateSun 19 Jan 2020, 19:44 (7 years ago) parent21f74cc7238168
4 files changed+218−1
pkgs/desktops/cinnamon/cjs/default.nix+82 pkgs/desktops/cinnamon/cjs/fix-werror.patch+39 pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix+95 pkgs/desktops/cinnamon/default.nix+2−1
pkgs/desktops/cinnamon/cjs/default.nixnew file+82
@@ -0,0 +1,82 @@
1+{ autoconf-archive
2+, autoreconfHook
3+, dbus-glib
4+, fetchFromGitHub
5+, gobject-introspection
6+, pkgconfig
7+, stdenv
8+, wrapGAppsHook
9+, python3
10+, cairo
11+, gnome3
12+, xapps
13+, keybinder3
14+, upower
15+, callPackage
16+, glib
17+, libffi
18+, gtk3
19+, readline
20+}:
21+
22+let
23+
24+ # https://github.com/linuxmint/cjs/issues/80
25+ spidermonkey_52 = callPackage ./spidermonkey_52.nix {};
26+
27+in
28+
29+stdenv.mkDerivation rec {
30+ pname = "cjs";
31+ version = "4.4.0";
32+
33+ src = fetchFromGitHub {
34+ owner = "linuxmint";
35+ repo = pname;
36+ rev = version;
37+ sha256 = "0q5h2pbwysc6hwq5js3lwi6zn7i5qjjy070ynfhfn3z69lw5iz2d";
38+ };
39+
40+ propagatedBuildInputs = [
41+ glib
42+
43+ # bindings
44+ gnome3.caribou
45+ keybinder3
46+ upower
47+ xapps
48+ ];
49+
50+ nativeBuildInputs = [
51+ autoconf-archive
52+ autoreconfHook
53+ wrapGAppsHook
54+ pkgconfig
55+ ];
56+
57+ buildInputs = [
58+ # from .pc
59+ gobject-introspection
60+ libffi
61+ spidermonkey_52 # mozjs-52
62+ cairo # +cairo-gobject
63+ gtk3
64+
65+ # other
66+
67+ dbus-glib
68+ readline
69+ ];
70+
71+ meta = with stdenv.lib; {
72+ homepage = "https://github.com/linuxmint/cjs";
73+ description = "JavaScript bindings for Cinnamon";
74+
75+ longDescription = ''
76+ This module contains JavaScript bindings based on gobject-introspection.
77+ '';
78+
79+ platforms = platforms.linux;
80+ maintainers = [ maintainers.mkg20001 ];
81+ };
82+}
pkgs/desktops/cinnamon/cjs/fix-werror.patchnew file+39
@@ -0,0 +1,39 @@
1+From 1b802175914418f5675047c34f1ab1593dd35b18 Mon Sep 17 00:00:00 2001
2+From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
3+Date: Wed, 8 Jan 2020 11:04:27 +0100
4+Subject: [PATCH] fix werror
5+
6+---
7+ js/src/moz.build | 2 +-
8+ js/src/shell/moz.build | 2 +-
9+ 2 files changed, 2 insertions(+), 2 deletions(-)
10+
11+diff --git a/js/src/moz.build b/js/src/moz.build
12+index 1162cb70c..595ea9842 100644
13+--- a/js/src/moz.build
14++++ b/js/src/moz.build
15+@@ -785,7 +785,7 @@ if CONFIG['JS_HAS_CTYPES']:
16+ DEFINES['FFI_BUILDING'] = True
17+
18+ if CONFIG['GNU_CXX']:
19+- CXXFLAGS += ['-Wno-shadow', '-Werror=format']
20++ CXXFLAGS += ['-Wno-shadow']
21+
22+ # Suppress warnings in third-party code.
23+ if CONFIG['CLANG_CXX']:
24+diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build
25+index 72ea8145c..77475b241 100644
26+--- a/js/src/shell/moz.build
27++++ b/js/src/shell/moz.build
28+@@ -51,7 +51,7 @@ shellmoduleloader.inputs = [
29+ ]
30+
31+ if CONFIG['GNU_CXX']:
32+- CXXFLAGS += ['-Wno-shadow', '-Werror=format']
33++ CXXFLAGS += ['-Wno-shadow']
34+
35+ # This is intended as a temporary workaround to enable VS2015.
36+ if CONFIG['_MSC_VER']:
37+--
38+2.17.1
39+
pkgs/desktops/cinnamon/cjs/spidermonkey_52.nixnew file+95
@@ -0,0 +1,95 @@
1+{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, zip, which, readline, icu, zlib, nspr, buildPackages }:
2+
3+let
4+ version = "52.9.0";
5+in stdenv.mkDerivation {
6+ pname = "spidermonkey";
7+ inherit version;
8+
9+ src = fetchurl {
10+ url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
11+ sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0";
12+ };
13+
14+ outputs = [ "out" "dev" ];
15+ setOutputFlags = false; # Configure script only understands --includedir
16+
17+ buildInputs = [ readline icu zlib nspr ];
18+ nativeBuildInputs = [ autoconf213 pkgconfig perl which buildPackages.python2 zip ];
19+
20+ # Apparently this package fails to build correctly with modern compilers, which at least
21+ # on ARMv6 causes polkit testsuite to break with an assertion failure in spidermonkey.
22+ # These flags were stolen from:
23+ # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/js52
24+ NIX_CFLAGS_COMPILE = "-fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp";
25+
26+ patches = [
27+ # needed to build gnome3.gjs
28+ (fetchpatch {
29+ name = "mozjs52-disable-mozglue.patch";
30+ url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be;
31+ sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0";
32+ })
33+ (fetchpatch {
34+ url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/no-error.diff?h=packages/js52;
35+ sha256 = "1vsw6558lxiy0r1mg6y49cgddan1mfqvqlkyv734bgxyg6n3pb9i";
36+ })
37+ ./fix-werror.patch
38+ ];
39+
40+ configurePlatforms = [ ];
41+
42+ preConfigure = ''
43+ export CXXFLAGS="-fpermissive"
44+ export LIBXUL_DIST=$out
45+ export PYTHON="${buildPackages.python2.interpreter}"
46+ configureFlagsArray+=("--includedir=$dev/include")
47+
48+ cd js/src
49+
50+ autoconf
51+ '';
52+
53+ configureFlags = [
54+ "--with-nspr-prefix=${nspr}"
55+ "--with-system-zlib"
56+ "--with-system-icu"
57+ "--with-intl-api"
58+ "--enable-readline"
59+ "--enable-shared-js"
60+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc"
61+ ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
62+ "--host=${stdenv.buildPlatform.config}"
63+ "--target=${stdenv.hostPlatform.config}"
64+ ];
65+
66+ makeFlags = [
67+ "HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
68+ ];
69+
70+ depsBuildBuild = [ buildPackages.stdenv.cc ];
71+
72+ enableParallelBuilding = true;
73+
74+ postInstall = ''
75+ moveToOutput bin/js52-config "$dev"
76+ # Nuke a static lib.
77+ rm $out/lib/libjs_static.ajs
78+ '';
79+
80+ meta = with stdenv.lib; {
81+ description = "Mozilla's JavaScript engine written in C/C++";
82+ homepage = https://developer.mozilla.org/en/SpiderMonkey;
83+ license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
84+ maintainers = [ maintainers.abbradar ];
85+ platforms = platforms.linux;
86+
87+ # Commented out so hydra builds the package
88+ # (I know what you're thinking now, but cjs won't be pulling anything from the network
89+ # and modules are allowed to execute commands anyways, so an RCE is basically irrelevant)
90+ #
91+ # knownVulnerabilities = [
92+ # "The runtime was extracted from Firefox 52, which EOL’d on September 5, 2018."
93+ # ];
94+ };
95+}
pkgs/desktops/cinnamon/default.nix+2−1
@@ -1,5 +1,6 @@
11{ pkgs, lib }:
22
33lib.makeScope pkgs.newScope (self: with self; {
4− xapps = callPackage ./xapps {};
4+ cjs = callPackage ./cjs { };
5+ xapps = callPackage ./xapps { };
56})