From 81b681c0f55df908e6494b97c262a0cc5012d5ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Aug 2018 12:53:12 -0700 Subject: [PATCH 1/3] sc-controller: 0.4.3 -> 0.4.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sc-controller/versions. --- pkgs/misc/drivers/sc-controller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 5583461d375..872a90f7f59 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "kozec"; repo = pname; rev = "v${version}"; - sha256 = "0w4ykl78vdppqr3d4d0h1f31wly6kis57a1gxhnrbpfrgpj0qhvj"; + sha256 = "0ki9x28i5slpnygkpdglcvj8cssvvjyz732y1cnpzw1f0sj0kris"; }; nativeBuildInputs = [ wrapGAppsHook ]; From 5914624410d37f3f96560214609c4a0c73310d1d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 21 Aug 2018 10:56:52 +0200 Subject: [PATCH 2/3] sc-controller: fix udev for NixOS --- pkgs/misc/drivers/sc-controller/default.nix | 6 +++-- .../misc/drivers/sc-controller/fix-udev.patch | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 pkgs/misc/drivers/sc-controller/fix-udev.patch diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 872a90f7f59..a13b49bd6cf 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -2,7 +2,7 @@ , gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg , evdev, pygobject3, pylibacl, pytest , linuxHeaders -, libX11, libXext, libXfixes, libusb1 +, libX11, libXext, libXfixes, libusb1, libudev }: buildPythonApplication rec { @@ -24,12 +24,14 @@ buildPythonApplication rec { checkInputs = [ pytest ]; + patches = [ ./fix-udev.patch ]; + postPatch = '' substituteInPlace scc/paths.py --replace sys.prefix "'$out'" substituteInPlace scc/uinput.py --replace /usr/include ${linuxHeaders}/include ''; - LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 libudev ]; preFixup = '' gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") diff --git a/pkgs/misc/drivers/sc-controller/fix-udev.patch b/pkgs/misc/drivers/sc-controller/fix-udev.patch new file mode 100644 index 00000000000..2416ac216d7 --- /dev/null +++ b/pkgs/misc/drivers/sc-controller/fix-udev.patch @@ -0,0 +1,22 @@ +diff --git a/scc/lib/eudevmonitor.py b/scc/lib/eudevmonitor.py +index 6c1bd18..182eff2 100644 +--- a/scc/lib/eudevmonitor.py ++++ b/scc/lib/eudevmonitor.py +@@ -28,12 +28,11 @@ class Eudev: + + def __init__(self): + self._ctx = None +- self._lib = ctypes.CDLL(find_library(self.LIB_NAME)) +- if self._lib is None: +- # Alternative approach for NixOS +- try: +- self._lib = ctypes.cdll.LoadLibrary("libudev.so") +- except OSError: ++ try: ++ self._lib = ctypes.cdll.LoadLibrary("libudev.so") ++ except OSError: ++ self._lib = ctypes.CDLL(find_library(self.LIB_NAME)) ++ if self._lib is None: + raise ImportError("No library named udev") + Eudev._setup_lib(self._lib) + self._ctx = self._lib.udev_new() From 8670ee4689285dde42b0c84d94f91603ff65f8b6 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 27 Aug 2018 02:14:26 +0200 Subject: [PATCH 3/3] sc-controller: fix missing libbluetooth.so --- pkgs/misc/drivers/sc-controller/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index a13b49bd6cf..f1c4ff09157 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook , gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg -, evdev, pygobject3, pylibacl, pytest +, evdev, pygobject3, pylibacl, pytest, bluez , linuxHeaders , libX11, libXext, libXfixes, libusb1, libudev }: @@ -24,14 +24,17 @@ buildPythonApplication rec { checkInputs = [ pytest ]; - patches = [ ./fix-udev.patch ]; + patches = [ + ./fix-udev.patch # fix upstream issue #401, remove with the next update + ]; postPatch = '' substituteInPlace scc/paths.py --replace sys.prefix "'$out'" substituteInPlace scc/uinput.py --replace /usr/include ${linuxHeaders}/include + substituteInPlace scc/device_monitor.py --replace "find_library('bluetooth')" "'libbluetooth.so.3'" ''; - LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 libudev ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 libudev bluez ]; preFixup = '' gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH")