ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

solaar: fix, partially (close #12685)

Browse Source 
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
This commit is contained in:
Tomasz Czyż 2016-01-30 00:42:57 +00:00 committed by Vladimír Čunát
parent 8491d0d1ca
commit 0c5ad78c18
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/misc/solaar/default.nix
View File

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