Merge pull request #57592 from samueldr/solaar/update

solaar: 2018-02-02 -> 2019-01-30 + udev rules inclusion
This commit is contained in:
Sarah Brofeldt 2019-03-16 17:02:28 +01:00 committed by GitHub
commit 271ce3f79e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,13 +1,13 @@
{fetchFromGitHub, stdenv, gtk3, pythonPackages, gobject-introspection}: {fetchFromGitHub, stdenv, gtk3, pythonPackages, gobject-introspection}:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "solaar-unstable-${version}"; pname = "solaar-unstable";
version = "2018-02-02"; version = "2019-01-30";
namePrefix = "";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pwr"; owner = "pwr";
repo = "Solaar"; repo = "Solaar";
rev = "59b7285fdfc875119f0c92cfd5f5909e8a8e578c"; rev = "c07c115ee379e82db84283aaa29dc53df033a8c8";
sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3"; sha256 = "0xg181xcwzzs8pdqvjrkjyaaga7ir93hzjvd17j9g3ns8xfj2mvr";
}; };
propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobject-introspection gtk3]; propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobject-introspection gtk3];
@ -18,6 +18,9 @@ pythonPackages.buildPythonApplication rec {
wrapProgram "$out/bin/solaar-cli" \ wrapProgram "$out/bin/solaar-cli" \
--prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PYTHONPATH : "$PYTHONPATH" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
mkdir -p $out/lib/udev/rules.d
cp rules.d/*.rules $out/lib/udev/rules.d/
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;