Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 50efa1979d86
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 10c9ec68ac42
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 1, 2018

  1. bluez: add tools to output that we were building anyway

    @peterhoeg
    peterhoeg committed May 1, 2018

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    4c66aa8 View commit details

Commits on May 10, 2018

  1. Merge pull request #39813 from peterhoeg/f/bluez 

    bluez: add tools to output that we were building anyway
    @peterhoeg
    peterhoeg authored May 10, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    10c9ec6 View commit details
Showing with 23 additions and 12 deletions.
  1. +23 −12 pkgs/os-specific/linux/bluez/default.nix
35 changes: 23 additions & 12 deletions pkgs/os-specific/linux/bluez/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,24 +10,28 @@ stdenv.mkDerivation rec {
sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k";
};

pythonPath = with pythonPackages;
[ dbus-python pygobject2 pygobject3 recursivePthLoader ];
pythonPath = with pythonPackages; [
dbus-python pygobject2 pygobject3 recursivePthLoader
];

buildInputs = [
pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
readline udev libical
];

nativeBuildInputs = [ pkgconfig ];

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 "
'';
postConfigure = ''
substituteInPlace tools/hid2hci.rules \
--replace /sbin/udevadm ${systemd}/bin/udevadm \
--replace "hid2hci " "$out/lib/udev/hid2hci "
'';

configureFlags = [
configureFlags = (with stdenv.lib; [
"--localstatedir=/var"
"--enable-library"
"--enable-cups"
@@ -38,8 +42,8 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-systemduserunitdir=$(out)/etc/systemd/user"
"--with-udevdir=$(out)/lib/udev"
] ++ stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]
++ stdenv.lib.optional enableMidi [ "--enable-midi" ];
] ++ optional enableWiimote [ "--enable-wiimote" ]
++ optional enableMidi [ "--enable-midi" ]);

# Work around `make install' trying to create /var/lib/bluetooth.
installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
@@ -71,14 +75,21 @@ stdenv.mkDerivation rec {
# Add extra configuration
mkdir $out/etc/bluetooth
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;

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";
homepage = http://www.bluez.org/;
license = with licenses; [ gpl2 lgpl21 ];
platforms = platforms.linux;
repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
};
}