mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
bluez4: remove, unused and probably vulnerable
This commit is contained in:
Franz Pletz
parent
dadb16a57f
commit
94bbe7db22
@ -1,91 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
|
||||
pythonPackages, readline, libsndfile, udev, libical,
|
||||
systemd, enableWiimote ? false }:
|
||||
|
||||
assert stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bluez-5.47";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
|
||||
sha256 = "1j22hfjz0fp4pgclgz9mfcwjbr4wqgah3gd2qhfg4r6msmybyxfg";
|
||||
};
|
||||
|
||||
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
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "test" ];
|
||||
|
||||
patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm
|
||||
substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci "
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--enable-library"
|
||||
"--enable-cups"
|
||||
"--enable-pie"
|
||||
"--with-dbusconfdir=$(out)/etc"
|
||||
"--with-dbussystembusdir=$(out)/share/dbus-1/system-services"
|
||||
"--with-dbussessionbusdir=$(out)/share/dbus-1/services"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--with-systemduserunitdir=$(out)/etc/systemd/user"
|
||||
"--with-udevdir=$(out)/lib/udev"
|
||||
] ++
|
||||
stdenv.lib.optional enableWiimote [ "--enable-wiimote" ];
|
||||
|
||||
# Work around `make install' trying to create /var/lib/bluetooth.
|
||||
installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
|
||||
|
||||
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
|
||||
cp -a test $test
|
||||
pushd $test/test
|
||||
for a in \
|
||||
simple-agent \
|
||||
test-adapter \
|
||||
test-device \
|
||||
test-thermometer \
|
||||
list-devices \
|
||||
monitor-bluetooth \
|
||||
; do
|
||||
ln -s ../test/$a $out/bin/bluez-$a
|
||||
done
|
||||
popd
|
||||
wrapPythonProgramsIn $test/test "$test/test $pythonPath"
|
||||
|
||||
# for bluez4 compatibility for NixOS
|
||||
mkdir $out/sbin
|
||||
ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
|
||||
ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
|
||||
|
||||
# Add extra configuration
|
||||
mkdir $out/etc/bluetooth
|
||||
ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.bluez.org/;
|
||||
repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
|
||||
description = "Bluetooth support for Linux";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,53 +1,91 @@
|
||||
{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, pythonPackages, makeWrapper
|
||||
, readline, libsndfile }:
|
||||
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
|
||||
pythonPackages, readline, libsndfile, udev, libical,
|
||||
systemd, enableWiimote ? false }:
|
||||
|
||||
assert stdenv.isLinux;
|
||||
|
||||
let
|
||||
inherit (pythonPackages) python;
|
||||
pythonpath = "${pythonPackages.dbus-python}/lib/${python.libPrefix}/site-packages:"
|
||||
+ "${pythonPackages.pygobject2}/lib/${python.libPrefix}/site-packages";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "bluez-4.101";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bluez-5.47";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
|
||||
sha256 = "11vldy255zkmmpj0g0a1m6dy9bzsmyd7vxy02cdfdw79ml888wsr";
|
||||
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
|
||||
sha256 = "1j22hfjz0fp4pgclgz9mfcwjbr4wqgah3gd2qhfg4r6msmybyxfg";
|
||||
};
|
||||
|
||||
pythonPath = with pythonPackages;
|
||||
[ dbus pygobject2 pygobject3 recursivePthLoader ];
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig dbus glib libusb alsaLib python makeWrapper
|
||||
readline libsndfile
|
||||
[ 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
|
||||
# gstreamer gst-plugins-base
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "test" ];
|
||||
|
||||
patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm
|
||||
substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci "
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--enable-library"
|
||||
"--enable-cups"
|
||||
"--with-systemdunitdir=$(out)/etc/systemd/system"
|
||||
];
|
||||
"--enable-pie"
|
||||
"--with-dbusconfdir=$(out)/etc"
|
||||
"--with-dbussystembusdir=$(out)/share/dbus-1/system-services"
|
||||
"--with-dbussessionbusdir=$(out)/share/dbus-1/services"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--with-systemduserunitdir=$(out)/etc/systemd/user"
|
||||
"--with-udevdir=$(out)/lib/udev"
|
||||
] ++
|
||||
stdenv.lib.optional enableWiimote [ "--enable-wiimote" ];
|
||||
|
||||
# Work around `make install' trying to create /var/lib/bluetooth.
|
||||
installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
|
||||
|
||||
makeFlags = "rulesdir=$(out)/lib/udev/rules.d";
|
||||
|
||||
/* !!! Move these into a separate package to prevent Bluez from
|
||||
depending on Python etc. */
|
||||
# FIXME: Move these into a separate package to prevent Bluez from
|
||||
# depending on Python etc.
|
||||
postInstall = ''
|
||||
pushd test
|
||||
for a in simple-agent test-adapter test-device test-input; do
|
||||
cp $a $out/bin/bluez-$a
|
||||
wrapProgram $out/bin/bluez-$a --prefix PYTHONPATH : ${pythonpath}
|
||||
mkdir -p $test/test
|
||||
cp -a test $test
|
||||
pushd $test/test
|
||||
for a in \
|
||||
simple-agent \
|
||||
test-adapter \
|
||||
test-device \
|
||||
test-thermometer \
|
||||
list-devices \
|
||||
monitor-bluetooth \
|
||||
; do
|
||||
ln -s ../test/$a $out/bin/bluez-$a
|
||||
done
|
||||
popd
|
||||
wrapPythonProgramsIn $test/test "$test/test $pythonPath"
|
||||
|
||||
# for bluez4 compatibility for NixOS
|
||||
mkdir $out/sbin
|
||||
ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
|
||||
ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
|
||||
|
||||
# Add extra configuration
|
||||
mkdir $out/etc/bluetooth
|
||||
ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf
|
||||
'';
|
||||
|
||||
meta = {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.bluez.org/;
|
||||
repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
|
||||
description = "Bluetooth support for Linux";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -11924,9 +11924,7 @@ with pkgs;
|
||||
|
||||
blktrace = callPackage ../os-specific/linux/blktrace { };
|
||||
|
||||
bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { };
|
||||
|
||||
bluez4 = callPackage ../os-specific/linux/bluez { };
|
||||
bluez5 = callPackage ../os-specific/linux/bluez { };
|
||||
|
||||
# Needed for LibreOffice
|
||||
bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { });
|
||||
|
||||
Loading…
Reference in New Issue
Block a user