diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-02 15:54:30 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-02 15:54:42 -0700 |
| commit | 8de4be096ff276eff71347e548d736e589df5f11 (patch) | |
| tree | 0be7bae70634f66d5c1a450861a65ce50dc91144 /pkgs/os-specific/linux/ffado | |
| parent | ab50b069e1a3a88028b5bf0fb2e6a6f37a04e686 (diff) | |
| download | nixpkgs-8de4be096ff276eff71347e548d736e589df5f11.tar nixpkgs-8de4be096ff276eff71347e548d736e589df5f11.tar.gz nixpkgs-8de4be096ff276eff71347e548d736e589df5f11.tar.bz2 nixpkgs-8de4be096ff276eff71347e548d736e589df5f11.tar.lz nixpkgs-8de4be096ff276eff71347e548d736e589df5f11.tar.xz nixpkgs-8de4be096ff276eff71347e548d736e589df5f11.tar.zst nixpkgs-8de4be096ff276eff71347e548d736e589df5f11.zip | |
ffado: Refactor and cleanup
Diffstat (limited to 'pkgs/os-specific/linux/ffado')
| -rw-r--r-- | pkgs/os-specific/linux/ffado/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index dcbf0e567ad..b0f545b2171 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -3,10 +3,7 @@ # Optional dependencies , libjack2 ? null, dbus ? null, dbus_cplusplus ? null, alsaLib ? null -, pyqt4 ? null, xdg_utils ? null - -, glibmm -, pythonDBus, qt4 +, pyqt4 ? null, pythonDBus ? null, xdg_utils ? null # Other Flags , prefix ? "" @@ -23,6 +20,7 @@ let optDbus_cplusplus = shouldUsePkg dbus_cplusplus; optAlsaLib = shouldUsePkg alsaLib; optPyqt4 = shouldUsePkg pyqt4; + optPythonDBus = shouldUsePkg pythonDBus; optXdg_utils = shouldUsePkg xdg_utils; in stdenv.mkDerivation rec { @@ -41,9 +39,6 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals (!libOnly) [ optLibjack2 optDbus optDbus_cplusplus optAlsaLib optPyqt4 optXdg_utils - # dbus dbus_cplusplus glibmm - # pyqt4 - # python pythonDBus qt4 ]; patches = [ ./build-fix.patch ]; @@ -76,11 +71,12 @@ stdenv.mkDerivation rec { LIBDIR=$out/lib INCLUDEDIR=$out/include install '' else '' scons PREFIX=$out PYPKGDIR=$PYDIR UDEVDIR=$out/lib/udev/rules.d install - + '' + stdenv.lib.optionalString (optPyqt4 != null && optPythonDBus != null) '' wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \ - $PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX: + $PYTHONPATH:$PYDIR:${optPyqt4}/$LIBSUFFIX:${optPythonDBus}/$LIBSUFFIX: + wrapProgram $out/bin/ffado-diag --prefix PYTHONPATH : \ - $PYTHONPATH:$PYDIR:$out/share/libffado/python:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX: + $PYTHONPATH:$PYDIR:$out/share/libffado/python:${optPyqt4}/$LIBSUFFIX:${optPythonDBus}/$LIBSUFFIX: ''; meta = with stdenv.lib; { |