diff options
author | Robin Gloster <mail@glob.in> | 2017-09-27 21:23:28 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-09-27 21:25:05 +0200 |
commit | 50fb62994b3d188542f14aa7066e4675f2d94458 (patch) | |
tree | 49d555c5075db443cb3684439174995b7015af73 /pkgs/os-specific/linux/bluez | |
parent | e83b78b3ed1823fb12aedd709de53bb7e4aba451 (diff) |
bluez: remove unneeded dependencies and fix test bins
Diffstat (limited to 'pkgs/os-specific/linux/bluez')
-rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index f0a59f36e433b..e9a1f314abc17 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - pythonPackages, readline, libsndfile, udev, libical, + pythonPackages, readline, udev, libical, systemd, enableWiimote ? false }: assert stdenv.isLinux; @@ -15,13 +15,10 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ dbus pygobject2 pygobject3 recursivePthLoader ]; - buildInputs = - [ pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython - readline libsndfile udev libical - # Disables GStreamer; not clear what it gains us other than a - # zillion extra dependencies. - # gstreamer gst-plugins-base - ]; + buildInputs = [ + pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython + readline udev libical + ]; outputs = [ "out" "dev" "test" ]; @@ -51,10 +48,8 @@ stdenv.mkDerivation rec { makeFlags = "rulesdir=$(out)/lib/udev/rules.d"; - # FIXME: Move these into a separate package to prevent Bluez from - # depending on Python etc. postInstall = '' - mkdir -p $test/test + mkdir -p $test/{bin,test} cp -a test $test pushd $test/test for a in \ @@ -65,7 +60,7 @@ stdenv.mkDerivation rec { list-devices \ monitor-bluetooth \ ; do - ln -s ../test/$a $out/bin/bluez-$a + ln -s ../test/$a $test/bin/bluez-$a done popd wrapPythonProgramsIn $test/test "$test/test $pythonPath" |