git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #105272 from mvnetbiz/gsconnect

gnomeExtensions.gsconnect: fix installed tests

commit2fde2721107d8ed967f17d3faee2afe7611fcc06 authorJan Tojnar <jtojnar@gmail.com> dateThu 3 Dec 2020, 02:27 (6 years ago) parent258bc1bb421c61
1 file changed+8−12
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+8−12
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+8−12
@@ -9,15 +9,12 @@
99, gobject-introspection
1010, wrapGAppsHook
1111, glib
12+, glib-networking
1213, gtk3
1314, openssh
1415, gnome3
1516, gjs
1617, nixosTests
17−, atk
18−, harfbuzz
19−, pango
20−, gdk-pixbuf
2118, gsettings-desktop-schemas
2219}:
2320
@@ -55,6 +52,7 @@ stdenv.mkDerivation rec {
5552
5653 buildInputs = [
5754 glib # libgobject
55+ glib-networking
5856 gtk3
5957 gsound
6058 gjs # for running daemon
@@ -87,20 +85,18 @@ stdenv.mkDerivation rec {
8785 done
8886 '';
8987
90− postFixup = let
91− testDeps = [
92− gtk3 harfbuzz atk pango.out gdk-pixbuf
93− ];
94− in ''
88+ postFixup = ''
9589 # Let’s wrap the daemons
9690 for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{daemon,nativeMessagingHost}.js; do
9791 echo "Wrapping program $file"
9892 wrapGApp "$file"
9993 done
10094
101− wrapProgram "$installedTests/libexec/installed-tests/gsconnect/minijasmine" \
102− --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
103− --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
95+ # Wrap jasmine runner for tests
96+ for file in $installedTests/libexec/installed-tests/gsconnect/minijasmine; do
97+ echo "Wrapping program $file"
98+ wrapGApp "$file"
99+ done
104100 '';
105101
106102 uuid = "gsconnect@andyholmes.github.io";