ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 20:19:16 +03:00
Code Issues Projects Releases Wiki Activity

ffado: actually get rid of Qt dependency for real this time

Browse Source
This commit is contained in:
K900 2024-07-12 13:05:41 +03:00
parent 83881cb6e9
commit b99be9ccc7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/ffado/default.nix
View File

@ -1,11 +1,9 @@
{ {
lib, lib,
stdenv, stdenv,
mkDerivation,
argp-standalone, argp-standalone,
dbus, dbus,
dbus_cplusplus, dbus_cplusplus,
desktop-file-utils,
fetchurl, fetchurl,
glibmm, glibmm,
libavc1394, libavc1394,
@ -18,7 +16,7 @@
scons, scons,
which, which,
withMixer ? false, withMixer ? false,
wrapQtAppsHook, qt5,
}: }:
let let
@ -33,7 +31,7 @@ let
else else
python311; python311;
in in
mkDerivation rec { stdenv.mkDerivation rec {
pname = "ffado"; pname = "ffado";
version = "2.4.9"; version = "2.4.9";
@ -65,7 +63,7 @@ mkDerivation rec {
++ lib.optionals withMixer [ ++ lib.optionals withMixer [
python python
python.pkgs.pyqt5 python.pkgs.pyqt5
wrapQtAppsHook qt5.wrapQtAppsHook
]; ];
prefixKey = "PREFIX="; prefixKey = "PREFIX=";

4
pkgs/top-level/all-packages.nix
View File

@ -26753,8 +26753,8 @@ with pkgs;
fatrace = callPackage ../os-specific/linux/fatrace { }; fatrace = callPackage ../os-specific/linux/fatrace { };
ffado = libsForQt5.callPackage ../os-specific/linux/ffado { }; ffado = callPackage ../os-specific/linux/ffado { };
ffado-mixer = libsForQt5.callPackage ../os-specific/linux/ffado { withMixer = true; }; ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; };
libffado = ffado; libffado = ffado;
fbterm = callPackage ../os-specific/linux/fbterm { }; fbterm = callPackage ../os-specific/linux/fbterm { };