From 0c5ad78c18526425d57f3052790a53f67a3e2749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Czy=C5=BC?= <tomasz.czyz@gmail.com>
Date: Sat, 30 Jan 2016 00:42:57 +0000
Subject: [PATCH] solaar: fix, partially (close #12685)

vcunat's comments:
Unused parameter got removed.
CLI looks good now but the GUI still won't work with:

bin/..solaar-wrapped-wrapped:45: PyGIWarning:
 Gtk was imported without specifying a version first.
 Use gi.require_version('Gtk', '3.0') before import to ensure that the right version gets loaded.
  solaar.gtk.main()
 solaar: error: Argument 0 does not allow None as a value
---
 pkgs/applications/misc/solaar/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index db0798f64cf..9a199c7ee49 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,19 +1,14 @@
-{fetchurl, stdenv, makeWrapper, gtk3, python3Packages}:
-let
-  version = "0.9.2";
-in
-stdenv.mkDerivation {
+{fetchurl, stdenv, gtk3, python34Packages, gobjectIntrospection}:
+python34Packages.buildPythonPackage rec {
   name = "solaar-${version}";
+  version = "0.9.2";
+  namePrefix = "";
   src = fetchurl {
     sha256 = "0954grz2adggfzcj4df4mpr4d7qyl7w8rb4j2s0f9ymawl92i05j";
     url = "https://github.com/pwr/Solaar/archive/${version}.tar.gz";
   };
 
-  buildInputs = [gtk3 python3Packages.pygobject3 python3Packages.pyudev];
-  enableParallelBuilding = true;
-  installPhase = ''
-    mkdir -p "$out";
-  '';
+  propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3];
   postInstall = ''
     wrapProgram "$out/bin/solaar" \
       --prefix PYTHONPATH : "$PYTHONPATH" \
@@ -22,6 +17,8 @@ stdenv.mkDerivation {
       --prefix PYTHONPATH : "$PYTHONPATH" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
   '';
+
+  enableParallelBuilding = true;
   meta = with stdenv.lib; {
     description = "Linux devices manager for the Logitech Unifying Receiver";
     longDescription = ''