[gjs: 6/6] Merge remote-tracking branch 'origin/wip/jtojnar/nixos-fixes'

[Philip Chimento <pchimento src gnome org>]

commit e782ff8c9a0ca972ac7e74228214f4bff371cf33
Merge: 4ca5fd44 361a3197
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Mar 21 12:21:32 2020 -0700

    Merge remote-tracking branch 'origin/wip/jtojnar/nixos-fixes'
    
    See merge request GNOME/gjs!403

 build/compile-gschemas.py           |  7 +++++--
 installed-tests/debugger.test.in    |  2 +-
 installed-tests/js/meson.build      | 27 +++++++++++++--------------
 installed-tests/meson.build         | 21 ++++++++++-----------
 installed-tests/minijasmine.cpp     |  2 +-
 installed-tests/minijasmine.test.in |  2 +-
 installed-tests/script.test.in      |  2 +-
 meson.build                         |  8 ++++----
 8 files changed, 36 insertions(+), 35 deletions(-)
---