about summary refs log tree commit diff
path: root/nixpkgs/pkgs/misc/drivers
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-05-17 10:56:54 +0000
committerAlyssa Ross <hi@alyssa.is>2019-05-17 10:56:54 +0000
commitc1d22074139ab0d048a05b5e5116265d099114d6 (patch)
tree97977009422d675f8930f97c309b010481289e72 /nixpkgs/pkgs/misc/drivers
parent4dc8afe4fd6b18437150129e0a1ecc23c6a1c0b9 (diff)
parentbc9df0f66110039e495b6debe3a6cda4a1bb0fed (diff)
downloadnixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.gz
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.bz2
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.lz
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.xz
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.zst
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.zip
Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'
Diffstat (limited to 'nixpkgs/pkgs/misc/drivers')
-rw-r--r--nixpkgs/pkgs/misc/drivers/sc-controller/fix-udev.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/misc/drivers/sc-controller/fix-udev.patch b/nixpkgs/pkgs/misc/drivers/sc-controller/fix-udev.patch
deleted file mode 100644
index 2416ac216d76..000000000000
--- a/nixpkgs/pkgs/misc/drivers/sc-controller/fix-udev.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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()