summaryrefslogtreecommitdiffstats
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-12-03 02:27:04 +0100
committerGitHub <noreply@github.com>2020-12-03 02:27:04 +0100
commit2fde2721107d8ed967f17d3faee2afe7611fcc06 (patch)
treeec990c2d8ea5f7a5701d9ac60bf290eb8ebdedbc /pkgs/desktops
parent258bc1beb04dce63a5c54569497d4b4df11d1b6e (diff)
parentb421c61891a6ae387d22e1a3b33ae7af3f006595 (diff)
Merge pull request #105272 from mvnetbiz/gsconnect
gnomeExtensions.gsconnect: fix installed tests
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/extensions/gsconnect/default.nix20
1 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index 3d969f5c0bfd..d85efd0a4da4 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -9,15 +9,12 @@
, gobject-introspection
, wrapGAppsHook
, glib
+, glib-networking
, gtk3
, openssh
, gnome3
, gjs
, nixosTests
-, atk
-, harfbuzz
-, pango
-, gdk-pixbuf
, gsettings-desktop-schemas
}:
@@ -55,6 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib # libgobject
+ glib-networking
gtk3
gsound
gjs # for running daemon
@@ -87,20 +85,18 @@ stdenv.mkDerivation rec {
done
'';
- postFixup = let
- testDeps = [
- gtk3 harfbuzz atk pango.out gdk-pixbuf
- ];
- in ''
+ postFixup = ''
# Let’s wrap the daemons
for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{daemon,nativeMessagingHost}.js; do
echo "Wrapping program $file"
wrapGApp "$file"
done
- wrapProgram "$installedTests/libexec/installed-tests/gsconnect/minijasmine" \
- --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
- --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
+ # Wrap jasmine runner for tests
+ for file in $installedTests/libexec/installed-tests/gsconnect/minijasmine; do
+ echo "Wrapping program $file"
+ wrapGApp "$file"
+ done
'';
uuid = "gsconnect@andyholmes.github.io";