JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bluez: add tools to output that we were building anyway

Browse Source
This commit is contained in:
Peter Hoeg 2018-05-01 21:57:17 +08:00
parent 1b1be29bf8
commit 4c66aa8938
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,24 +12,28 @@ stdenv.mkDerivation rec {
sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k"; sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k";
}; };
pythonPath = with pythonPackages; pythonPath = with pythonPackages; [
[ dbus-python pygobject2 pygobject3 recursivePthLoader ]; dbus-python pygobject2 pygobject3 recursivePthLoader
];
buildInputs = [ buildInputs = [
pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
readline udev libical readline udev libical
]; ];
nativeBuildInputs = [ pkgconfig ];
outputs = [ "out" "dev" "test" ]; outputs = [ "out" "dev" "test" ];
patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ]; patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ];
preConfigure = '' postConfigure = ''
substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm substituteInPlace tools/hid2hci.rules \
substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci " --replace /sbin/udevadm ${systemd}/bin/udevadm \
''; --replace "hid2hci " "$out/lib/udev/hid2hci "
'';
configureFlags = [ configureFlags = (with stdenv.lib; [
"--localstatedir=/var" "--localstatedir=/var"
"--enable-library" "--enable-library"
"--enable-cups" "--enable-cups"
@ -40,8 +44,8 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-systemduserunitdir=$(out)/etc/systemd/user"
"--with-udevdir=$(out)/lib/udev" "--with-udevdir=$(out)/lib/udev"
] ++ stdenv.lib.optional enableWiimote [ "--enable-wiimote" ] ] ++ optional enableWiimote [ "--enable-wiimote" ]
++ stdenv.lib.optional enableMidi [ "--enable-midi" ]; ++ optional enableMidi [ "--enable-midi" ]);
# Work around `make install' trying to create /var/lib/bluetooth. # Work around `make install' trying to create /var/lib/bluetooth.
installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
@ -73,14 +77,21 @@ stdenv.mkDerivation rec {
# Add extra configuration # Add extra configuration
mkdir $out/etc/bluetooth mkdir $out/etc/bluetooth
ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf
# Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez
for files in `find tools/ -type f -perm -755`; do
filename=$(basename $files)
install -Dm755 tools/$filename $out/bin/$filename
done
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { 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"; description = "Bluetooth support for Linux";
homepage = http://www.bluez.org/;
license = with licenses; [ gpl2 lgpl21 ];
platforms = platforms.linux; platforms = platforms.linux;
repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
}; };
} }