diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 49dc2f4dd5d2..c0540e4080fe 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ assert ldacbtSupport -> bluezSupport; stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.2.0"; + version = "1.2.1"; outputs = [ "out" @@ -91,7 +91,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-hjjiH7+JoyRTcdbPDvkUEpO72b5p8CbTD6Un/vZrHL8="; + sha256 = "sha256-CkxsVD813LbWpuZhJkNLJnqjLF6jmEn+CajXb2XTCsY="; }; patches = [ diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 207e0a6fe30d..cf9c87ed625c 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, - mkDerivation, argp-standalone, dbus, dbus_cplusplus, - desktop-file-utils, fetchurl, glibmm, libavc1394, @@ -18,7 +16,7 @@ scons, which, withMixer ? false, - wrapQtAppsHook, + qt5, }: let @@ -33,7 +31,7 @@ let else python311; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "ffado"; version = "2.4.9"; @@ -65,7 +63,7 @@ mkDerivation rec { ++ lib.optionals withMixer [ python python.pkgs.pyqt5 - wrapQtAppsHook + qt5.wrapQtAppsHook ]; prefixKey = "PREFIX="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 028cf4bff2d4..b51ee374d49b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26726,8 +26726,8 @@ with pkgs; fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { }; - ffado-mixer = libsForQt5.callPackage ../os-specific/linux/ffado { withMixer = true; }; + ffado = callPackage ../os-specific/linux/ffado { }; + ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; }; libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { };