summary refs log tree commit diff
path: root/pkgs/applications/networking/syncthing-gtk
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-11-24 22:52:57 +0100
committerJan Tojnar <jtojnar@gmail.com>2018-01-26 06:13:44 +0100
commit58e50b8d588ce5330f7927b5ec50fb28b7f349ab (patch)
tree16fc1f2223e408a84c28920b91359db0bd13029f /pkgs/applications/networking/syncthing-gtk
parent0bbde0f026931a74b6c15487a0e6c24e13336a18 (diff)
downloadnixlib-58e50b8d588ce5330f7927b5ec50fb28b7f349ab.tar
nixlib-58e50b8d588ce5330f7927b5ec50fb28b7f349ab.tar.gz
nixlib-58e50b8d588ce5330f7927b5ec50fb28b7f349ab.tar.bz2
nixlib-58e50b8d588ce5330f7927b5ec50fb28b7f349ab.tar.lz
nixlib-58e50b8d588ce5330f7927b5ec50fb28b7f349ab.tar.xz
nixlib-58e50b8d588ce5330f7927b5ec50fb28b7f349ab.tar.zst
nixlib-58e50b8d588ce5330f7927b5ec50fb28b7f349ab.zip
syncthing-gtk: clean-up
Diffstat (limited to 'pkgs/applications/networking/syncthing-gtk')
-rw-r--r--pkgs/applications/networking/syncthing-gtk/default.nix21
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index f47fd2d0fd64..d4e34be36dde 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, syncthing, python2Packages }:
+{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, syncthing, wrapGAppsHook, gnome3, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   version = "0.9.2.3";
@@ -11,17 +11,18 @@ python2Packages.buildPythonApplication rec {
     sha256 = "0chl0f0kp6z0z00d1f3xjlicjfr9rzabw39wmjr66fwb5w5hcc42";
   };
 
-  propagatedBuildInputs = with python2Packages; [
-    syncthing dateutil pyinotify libnotify
-    (librsvg.override { withGTK = true; })
-    psmisc pygobject3 gtk3
+  nativeBuildInputs = [ wrapGAppsHook ];
+
+  buildInputs = [
+    gtk3 (librsvg.override { enableIntrospection = true; })
+    libnotify psmisc
+    # Schemas with proxy configuration
+    gnome3.gsettings_desktop_schemas
   ];
 
-  preFixup = ''
-    wrapProgram $out/bin/syncthing-gtk \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
-  '';
+  propagatedBuildInputs = with python2Packages; [
+    syncthing dateutil pyinotify pygobject3
+  ];
 
   patchPhase = ''
     substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"