ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

bluez: remove unneeded dependencies and fix test bins

Browse Source
This commit is contained in:
Robin Gloster 2017-09-27 21:23:28 +02:00
parent e83b78b3ed
commit 50fb62994b
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/os-specific/linux/bluez/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
pythonPackages, readline, libsndfile, udev, libical, pythonPackages, readline, udev, libical,
systemd, enableWiimote ? false }: systemd, enableWiimote ? false }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -15,12 +15,9 @@ stdenv.mkDerivation rec {
pythonPath = with pythonPackages; pythonPath = with pythonPackages;
[ dbus pygobject2 pygobject3 recursivePthLoader ]; [ dbus pygobject2 pygobject3 recursivePthLoader ];
buildInputs = buildInputs = [
[ pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
readline libsndfile udev libical readline udev libical
# Disables GStreamer; not clear what it gains us other than a
# zillion extra dependencies.
# gstreamer gst-plugins-base
]; ];
outputs = [ "out" "dev" "test" ]; outputs = [ "out" "dev" "test" ];
@ -51,10 +48,8 @@ stdenv.mkDerivation rec {
makeFlags = "rulesdir=$(out)/lib/udev/rules.d"; makeFlags = "rulesdir=$(out)/lib/udev/rules.d";
# FIXME: Move these into a separate package to prevent Bluez from
# depending on Python etc.
postInstall = '' postInstall = ''
mkdir -p $test/test mkdir -p $test/{bin,test}
cp -a test $test cp -a test $test
pushd $test/test pushd $test/test
for a in \ for a in \
@ -65,7 +60,7 @@ stdenv.mkDerivation rec {
list-devices \ list-devices \
monitor-bluetooth \ monitor-bluetooth \
; do ; do
ln -s ../test/$a $out/bin/bluez-$a ln -s ../test/$a $test/bin/bluez-$a
done done
popd popd
wrapPythonProgramsIn $test/test "$test/test $pythonPath" wrapPythonProgramsIn $test/test "$test/test $pythonPath"