@@ -1,16 +1,16 @@
1−{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, folks, gsound
1+{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, gsound
22, meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook
33, glib, gtk3, at-spi2-core, upower, openssh, gnome3, gjs }:
44
55stdenv.mkDerivation rec {
66 pname = "gnome-shell-gsconnect";
7− version = "30";
7+ version = "31";
88
99 src = fetchFromGitHub {
1010 owner = "andyholmes";
1111 repo = "gnome-shell-extension-gsconnect";
1212 rev = "v${version}";
13− sha256 = "17j96y72mj7vg2csn5c9rji7jy04x5qzl8knf5gky6wppxj9zjb4";
13+ sha256 = "0nricm31jh4akncs0rkkilmq9afg7kgbj5cy7w26pfqb3l4nhifg";
1414 };
1515
1616 patches = [
@@ -29,11 +29,9 @@ stdenv.mkDerivation rec {
2929 ];
3030
3131 buildInputs = [
32− (python3.withPackages (pkgs: [ python3.pkgs.pygobject3 ])) # for folks.py
3332 glib # libgobject
3433 gtk3
3534 at-spi2-core # atspi
36− folks # libfolks
3735 gnome3.nautilus # TODO: this contaminates the package with nautilus and gnome-autoar typelibs but it is only needed for the extension
3836 gnome3.nautilus-python
3937 gsound
@@ -66,15 +64,9 @@ stdenv.mkDerivation rec {
6664 done
6765 '';
6866
69− preFixup = ''
70− # TODO: figure out why folks GIR does not contain shared-library attribute
71− # https://github.com/NixOS/nixpkgs/issues/47226
72− gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ folks ]}")
73− '';
74−
7567 postFixup = ''
7668 # Let’s wrap the daemons
77− for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{{daemon,nativeMessagingHost}.js,components/folks.py}; do
69+ for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{daemon,nativeMessagingHost}.js; do
7870 echo "Wrapping program $file"
7971 wrapGApp "$file"
8072 done