summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-08-30 12:50:35 +0000
committerAlyssa Ross <hi@alyssa.is>2021-08-30 19:20:08 +0000
commit5ad9e2a74b1cfc4a0816f358a621562795638be0 (patch)
tree241abef27b665f201333bb4282d92d0c8d8bf706
parent7484cbf58e201d57a1cfafb26e08efeb50a07d2d (diff)
downloadnixpkgs-5ad9e2a74b1cfc4a0816f358a621562795638be0.tar
nixpkgs-5ad9e2a74b1cfc4a0816f358a621562795638be0.tar.gz
nixpkgs-5ad9e2a74b1cfc4a0816f358a621562795638be0.tar.bz2
nixpkgs-5ad9e2a74b1cfc4a0816f358a621562795638be0.tar.lz
nixpkgs-5ad9e2a74b1cfc4a0816f358a621562795638be0.tar.xz
nixpkgs-5ad9e2a74b1cfc4a0816f358a621562795638be0.tar.zst
nixpkgs-5ad9e2a74b1cfc4a0816f358a621562795638be0.zip
linuxPackages.akvcam: 1.2.0 -> 1.2.2
The qmake-based build didn't seem to work any more, but there's a
Kbuild-based build system available anyway, so let's just switch to
that and save a dependency.

Also clarify license.
-rw-r--r--pkgs/os-specific/linux/akvcam/default.nix18
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix
index 815dc6a2ee3..700389a4a18 100644
--- a/pkgs/os-specific/linux/akvcam/default.nix
+++ b/pkgs/os-specific/linux/akvcam/default.nix
@@ -1,32 +1,32 @@
-{ lib, stdenv, fetchFromGitHub, kernel, qmake }:
+{ lib, stdenv, fetchFromGitHub, kernel }:
 
 stdenv.mkDerivation rec {
   pname = "akvcam";
-  version = "1.2.0";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "webcamoid";
     repo = "akvcam";
     rev = version;
-    sha256 = "0r5xg7pz0wl6pq5029rpzm9fn978vq0md31xjkp2amny7rrgxw72";
+    sha256 = "1f0vjia2d7zj3y5c63lx1r537bdjx6821yxy29ilbrvsbjq2szj8";
   };
+  sourceRoot = "source/src";
 
-  nativeBuildInputs = [ qmake ];
-  dontWrapQtApps = true;
-
-  qmakeFlags = [
+  makeFlags = [
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 
   installPhase = ''
-    install -m644 -b -D src/akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko
+    install -m644 -b -D akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko
   '';
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     description = "Virtual camera driver for Linux";
     homepage = "https://github.com/webcamoid/akvcam";
     maintainers = with maintainers; [ freezeboy ];
     platforms = platforms.linux;
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 709e8a2054c..d6c75d3ee6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21341,9 +21341,7 @@ with pkgs;
 
     acpi_call = callPackage ../os-specific/linux/acpi-call {};
 
-    akvcam = callPackage ../os-specific/linux/akvcam {
-      inherit (qt5) qmake;
-    };
+    akvcam = callPackage ../os-specific/linux/akvcam { };
 
     amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };