diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-24 19:17:42 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-25 19:04:24 -0500 |
commit | 70936ce3f8691f868f9bac0eb3668f9f4af386af (patch) | |
tree | f5a0a33f8a48f5576d83299485582ec5b7c482ff /pkgs/os-specific/linux/bluez | |
parent | e0a2224f1e2b06dd118906dfce564b6130eb2a95 (diff) | |
download | nixpkgs-70936ce3f8691f868f9bac0eb3668f9f4af386af.tar nixpkgs-70936ce3f8691f868f9bac0eb3668f9f4af386af.tar.gz nixpkgs-70936ce3f8691f868f9bac0eb3668f9f4af386af.tar.bz2 nixpkgs-70936ce3f8691f868f9bac0eb3668f9f4af386af.tar.lz nixpkgs-70936ce3f8691f868f9bac0eb3668f9f4af386af.tar.xz nixpkgs-70936ce3f8691f868f9bac0eb3668f9f4af386af.tar.zst nixpkgs-70936ce3f8691f868f9bac0eb3668f9f4af386af.zip |
bluez5: multiple outputs
Diffstat (limited to 'pkgs/os-specific/linux/bluez')
-rw-r--r-- | pkgs/os-specific/linux/bluez/bluez5.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 9750a2a7649..a7e36d21dd4 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -6,7 +6,7 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { name = "bluez-5.37"; - + src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; sha256 = "c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0"; @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { 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 = [ "dev" "out" "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 " @@ -51,9 +53,9 @@ stdenv.mkDerivation rec { # 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 + mkdir -p $test/test + cp -a test $test + pushd $test/test for a in \ simple-agent \ test-adapter \ @@ -65,7 +67,7 @@ stdenv.mkDerivation rec { ln -s ../test/$a $out/bin/bluez-$a done popd - wrapPythonProgramsIn $out/test "$out/test $pythonPath" + wrapPythonProgramsIn $test/test "$test/test $pythonPath" # for bluez4 compatibility for NixOS mkdir $out/sbin |