about summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorSarah Brofeldt <sbrofeldt@gmail.com>2019-03-16 17:02:28 +0100
committerGitHub <noreply@github.com>2019-03-16 17:02:28 +0100
commit271ce3f79eb052dcc45b9805b82cf1736fe3bb06 (patch)
tree33da0a7b4bacb68f9e780c6cd1c087a4d8d85302 /pkgs/applications/misc
parent33e9fa2367c973d91bd729adce12634cc010dc8c (diff)
parent1cfdbe99402c33613d5d885b983557fe55e12a72 (diff)
downloadnixlib-271ce3f79eb052dcc45b9805b82cf1736fe3bb06.tar
nixlib-271ce3f79eb052dcc45b9805b82cf1736fe3bb06.tar.gz
nixlib-271ce3f79eb052dcc45b9805b82cf1736fe3bb06.tar.bz2
nixlib-271ce3f79eb052dcc45b9805b82cf1736fe3bb06.tar.lz
nixlib-271ce3f79eb052dcc45b9805b82cf1736fe3bb06.tar.xz
nixlib-271ce3f79eb052dcc45b9805b82cf1736fe3bb06.tar.zst
nixlib-271ce3f79eb052dcc45b9805b82cf1736fe3bb06.zip
Merge pull request #57592 from samueldr/solaar/update
solaar: 2018-02-02 -> 2019-01-30 + udev rules inclusion
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/solaar/default.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index cb64365a944f..1928da18681f 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,13 +1,13 @@
 {fetchFromGitHub, stdenv, gtk3, pythonPackages, gobject-introspection}:
 pythonPackages.buildPythonApplication rec {
-  name = "solaar-unstable-${version}";
-  version = "2018-02-02";
-  namePrefix = "";
+  pname = "solaar-unstable";
+  version = "2019-01-30";
+
   src = fetchFromGitHub {
     owner = "pwr";
     repo = "Solaar";
-    rev = "59b7285fdfc875119f0c92cfd5f5909e8a8e578c";
-    sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3";
+    rev = "c07c115ee379e82db84283aaa29dc53df033a8c8";
+    sha256 = "0xg181xcwzzs8pdqvjrkjyaaga7ir93hzjvd17j9g3ns8xfj2mvr";
   };
 
   propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobject-introspection gtk3];
@@ -18,6 +18,9 @@ pythonPackages.buildPythonApplication rec {
     wrapProgram "$out/bin/solaar-cli" \
       --prefix PYTHONPATH : "$PYTHONPATH" \
       --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;