diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:20:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:21:06 +0000 |
| commit | a42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (patch) | |
| tree | 7d481fea9872f62a034452612be17f4494159baa /nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch | |
| parent | 55f69a6b0e53c1c4b3e0396937c53bf5662b5519 (diff) | |
| parent | 9480bae337095fd24f61380bce3174fdfe926a00 (diff) | |
| download | nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.gz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.bz2 nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.lz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.xz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.zst nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.zip | |
Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'
This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch index 11a39b2dd9a5..f9b1515b68e3 100644 --- a/nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch +++ b/nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch @@ -1,5 +1,5 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build -index 294d20c6..1e5029e0 100644 +index 7e842025..1e5029e0 100644 --- a/installed-tests/meson.build +++ b/installed-tests/meson.build @@ -1,7 +1,7 @@ @@ -12,6 +12,19 @@ index 294d20c6..1e5029e0 100644 # Simple shell script tests # +diff --git a/meson.build b/meson.build +index 084d5396..e5d73fcd 100644 +--- a/meson.build ++++ b/meson.build +@@ -540,7 +540,7 @@ install_data('installed-tests/extra/lsan.supp', + install_dir: get_option('datadir') / api_name / 'lsan') + + if get_option('installed_tests') +- schemadir = abs_datadir / 'glib-2.0' / 'schemas' ++ schemadir = get_option('installed_test_prefix') / 'share' / 'glib-2.0' / 'schemas' + install_data('installed-tests/js/org.gnome.GjsTest.gschema.xml', install_dir: schemadir) + meson.add_install_script('build/compile-gschemas.py', schemadir) + endif diff --git a/meson_options.txt b/meson_options.txt index 66f66024..008687cb 100644 --- a/meson_options.txt |