mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
ffado: remove unused kernel argument, cleanup python env creation
This commit is contained in:
parent
275ba0f1cb
commit
b5dda80243
@ -8,7 +8,6 @@
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, glibmm
|
||||
, kernel
|
||||
, libavc1394
|
||||
, libconfig
|
||||
, libiec61883
|
||||
@ -22,7 +21,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3.pkgs) pyqt5 dbus-python;
|
||||
python = python3.withPackages (pkgs: with pkgs; [ pyqt5 dbus-python ]);
|
||||
in
|
||||
mkDerivation rec {
|
||||
@ -61,7 +59,7 @@ mkDerivation rec {
|
||||
pkg-config
|
||||
which
|
||||
python
|
||||
pyqt5
|
||||
python3.pkgs.pyqt5
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
|
@ -27239,9 +27239,7 @@ with pkgs;
|
||||
|
||||
fatrace = callPackage ../os-specific/linux/fatrace { };
|
||||
|
||||
ffado = libsForQt5.callPackage ../os-specific/linux/ffado {
|
||||
inherit (linuxPackages) kernel;
|
||||
};
|
||||
ffado = libsForQt5.callPackage ../os-specific/linux/ffado { };
|
||||
libffado = ffado;
|
||||
|
||||
fbterm = callPackage ../os-specific/linux/fbterm { };
|
||||
|
Loading…
Reference in New Issue
Block a user