Merge pull request #26665 from armijnhemel/bluez5_28_removal

bluez5_28: remove expression for bluez5_28, as it is no longer needed
This commit is contained in:
Michael Raskin 2018-04-13 22:35:09 +00:00 committed by GitHub
commit 267b90a40a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 85 deletions

View file

@ -1,82 +0,0 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
pythonPackages, readline, libsndfile, udev, libical,
systemd, enableWiimote ? false }:
assert stdenv.isLinux;
let
inherit (pythonPackages) python;
in stdenv.mkDerivation rec {
name = "bluez-5.28";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
sha256 = "1a8qzh38wpq5c0rydpx9isf0jc6g14g2qs18j1rmi8a79f7v9fl5";
};
pythonPath = with pythonPackages;
[ dbus pygobject2 pygobject3 recursivePthLoader ];
buildInputs =
[ pkgconfig dbus glib alsaLib 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
];
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-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 $out/test
cp -a test $out
pushd $out/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 $out/test "$out/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
'';
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;
};
}

View file

@ -12978,9 +12978,6 @@ with pkgs;
bluez5 = callPackage ../os-specific/linux/bluez { };
# Needed for LibreOffice
bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { });
bluez = bluez5;
inherit (python3Packages) bedup;