gjs: 1.64.4 -> 1.66.0
- Installed tests execdir was moved: https://gitlab.gnome.org/GNOME/gjs/-/issues/318 Changelogs: - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.1.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.2.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.3.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.4.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.90.news - libsysprof-capture-4 ← libsysprof-capture-3 - We did not depend on it previously either. - SpiderMonkey 78 - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.91.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.92.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.66/gjs-1.66.0.news Changes reviewed by: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
parent
cdc3ce564d
commit
dde31ed48e
@ -8,7 +8,7 @@
|
|||||||
, gtk3
|
, gtk3
|
||||||
, atk
|
, atk
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, spidermonkey_68
|
, spidermonkey_78
|
||||||
, pango
|
, pango
|
||||||
, cairo
|
, cairo
|
||||||
, readline
|
, readline
|
||||||
@ -29,11 +29,11 @@ let
|
|||||||
];
|
];
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "gjs";
|
pname = "gjs";
|
||||||
version = "1.64.4";
|
version = "1.66.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0k6l2qc2vkws34zrgdhl57qxf0jjkar2iziz6qn4n1w7va73mk53";
|
sha256 = "1y5m7as3jwhb3svb4xgk443hyxhijralk5q5s3ywidkd047gj37k";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" "installedTests" ];
|
outputs = [ "out" "dev" "installedTests" ];
|
||||||
@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
|
|||||||
gobject-introspection
|
gobject-introspection
|
||||||
cairo
|
cairo
|
||||||
readline
|
readline
|
||||||
spidermonkey_68
|
spidermonkey_78
|
||||||
dbus # for dbus-run-session
|
dbus # for dbus-run-session
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -88,22 +88,22 @@ in stdenv.mkDerivation rec {
|
|||||||
# in the GIR files. When running tests, the library is not yet installed,
|
# in the GIR files. When running tests, the library is not yet installed,
|
||||||
# though, so we need to replace the absolute path with a local one during build.
|
# though, so we need to replace the absolute path with a local one during build.
|
||||||
# We are using a symlink that will be overridden during installation.
|
# We are using a symlink that will be overridden during installation.
|
||||||
mkdir -p $out/lib $installedTests/libexec/gjs/installed-tests
|
mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs
|
||||||
ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
|
ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
|
||||||
ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/gjs/installed-tests/libgimarshallingtests.so
|
ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so
|
||||||
ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/gjs/installed-tests/libregress.so
|
ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so
|
||||||
ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/gjs/installed-tests/libwarnlib.so
|
ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
# TODO: make the glib setup hook handle this
|
# TODO: make the glib setup hook handle moving the schemas in other outputs.
|
||||||
installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/${pname}-${version}"
|
installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/${pname}-${version}"
|
||||||
mkdir -p "$installedTestsSchemaDatadir"
|
mkdir -p "$installedTestsSchemaDatadir"
|
||||||
mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir"
|
mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \
|
wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \
|
||||||
--prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \
|
--prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \
|
||||||
--prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
|
--prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
|
||||||
'';
|
'';
|
||||||
|
@ -1,22 +1,22 @@
|
|||||||
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
|
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
|
||||||
index 7e842025..1e5029e0 100644
|
index 04c7910f..9647908c 100644
|
||||||
--- a/installed-tests/meson.build
|
--- a/installed-tests/meson.build
|
||||||
+++ b/installed-tests/meson.build
|
+++ b/installed-tests/meson.build
|
||||||
@@ -1,7 +1,7 @@
|
@@ -1,7 +1,7 @@
|
||||||
### Installed tests ############################################################
|
### Installed tests ############################################################
|
||||||
|
|
||||||
-installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests'
|
-installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / meson.project_name()
|
||||||
-installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
|
-installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
|
||||||
+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / meson.project_name() / 'installed-tests'
|
+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name()
|
||||||
+installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name()
|
+installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name()
|
||||||
|
|
||||||
# Simple shell script tests #
|
# Simple shell script tests #
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
diff --git a/meson.build b/meson.build
|
||||||
index 084d5396..e5d73fcd 100644
|
index 9ab29475..42ffe07f 100644
|
||||||
--- a/meson.build
|
--- a/meson.build
|
||||||
+++ b/meson.build
|
+++ b/meson.build
|
||||||
@@ -540,7 +540,7 @@ install_data('installed-tests/extra/lsan.supp',
|
@@ -557,7 +557,7 @@ install_data('installed-tests/extra/lsan.supp',
|
||||||
install_dir: get_option('datadir') / api_name / 'lsan')
|
install_dir: get_option('datadir') / api_name / 'lsan')
|
||||||
|
|
||||||
if get_option('installed_tests')
|
if get_option('installed_tests')
|
||||||
@ -26,7 +26,7 @@ index 084d5396..e5d73fcd 100644
|
|||||||
meson.add_install_script('build/compile-gschemas.py', schemadir)
|
meson.add_install_script('build/compile-gschemas.py', schemadir)
|
||||||
endif
|
endif
|
||||||
diff --git a/meson_options.txt b/meson_options.txt
|
diff --git a/meson_options.txt b/meson_options.txt
|
||||||
index 66f66024..008687cb 100644
|
index 825ba77a..21f0323c 100644
|
||||||
--- a/meson_options.txt
|
--- a/meson_options.txt
|
||||||
+++ b/meson_options.txt
|
+++ b/meson_options.txt
|
||||||
@@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,
|
@@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,
|
||||||
|
Loading…
Reference in New Issue
Block a user