From c0a02801d7635a03022c6cb6b4d1c3efb516a0a9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 21:26:11 +0300
Subject: [PATCH 1/6] bluez5: enable parallel building
---
pkgs/os-specific/linux/bluez/bluez5.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 21925a5e1dd..2b73dc798c3 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -73,6 +73,8 @@ stdenv.mkDerivation rec {
ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
homepage = http://www.bluez.org/;
repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
From 1f20ca1f74e3f80624bf4a81022558e6434543d5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 22:44:15 +0300
Subject: [PATCH 2/6] bluez: default to bluez5
---
pkgs/top-level/all-packages.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c6f9f104b7..a760c007ea0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9858,16 +9858,16 @@ let
batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
- bluez4 = callPackage ../os-specific/linux/bluez {
+ bluez4 = lowPrio (callPackage ../os-specific/linux/bluez {
pygobject = pygobject3;
- };
+ });
- bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { });
+ bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { };
# Needed for LibreOffice
bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { });
- bluez = bluez4;
+ bluez = bluez5;
inherit (pythonPackages) bedup;
From bd4b54557dcceb7d7d1a77009a717abb7b96883f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 22:44:55 +0300
Subject: [PATCH 3/6] openobex: cleanup, add license
---
pkgs/tools/bluetooth/openobex/default.nix | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix
index 7baf1ac3ed9..ec5ca0706f4 100644
--- a/pkgs/tools/bluetooth/openobex/default.nix
+++ b/pkgs/tools/bluetooth/openobex/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, bluez, libusb, cmake}:
+{ stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }:
stdenv.mkDerivation rec {
name = "openobex-1.7.1";
@@ -8,18 +8,20 @@ stdenv.mkDerivation rec {
sha256 = "0mza0mrdrbcw4yix6qvl31kqy7bdkgxjycr0yx7yl089v5jlc9iv";
};
- buildInputs = [pkgconfig bluez libusb cmake];
+ nativeBuildInputs = [ pkgconfig cmake ];
+ buildInputs = [ bluez libusb ];
- configureFlags = "--enable-apps";
+ configureFlags = [ "--enable-apps" ];
patchPhase = ''
sed -i "s!/lib/udev!$out/lib/udev!" udev/CMakeLists.txt
sed -i "/if ( PKGCONFIG_UDEV_FOUND )/,/endif ( PKGCONFIG_UDEV_FOUND )/d" udev/CMakeLists.txt
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://dev.zuckschwerdt.org/openobex/;
description = "An open source implementation of the Object Exchange (OBEX) protocol";
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = licenses.lgpl2Plus;
};
}
From 4a00e1f70b62e406a0c9cc27f6e25477b1884764 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 22:45:14 +0300
Subject: [PATCH 4/6] obexftp: fix pkgconfig file, add license
---
pkgs/tools/bluetooth/obexftp/default.nix | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix
index 4a40b4393c3..12b021d5d3b 100644
--- a/pkgs/tools/bluetooth/obexftp/default.nix
+++ b/pkgs/tools/bluetooth/obexftp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, openobex, bluez, cmake}:
+{ stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }:
stdenv.mkDerivation rec {
name = "obexftp-0.24";
@@ -8,13 +8,21 @@ stdenv.mkDerivation rec {
sha256 = "0szy7p3y75bd5h4af0j5kf0fpzx2w560fpy4kg3603mz11b9c1xr";
};
- buildInputs = [pkgconfig bluez cmake];
+ nativeBuildInputs = [ pkgconfig cmake ];
- propagatedBuildInputs = [openobex];
+ buildInputs = [ bluez ];
- meta = {
+ propagatedBuildInputs = [ openobex ];
+
+ # There's no such thing like "bluetooth" library; possibly they meant "bluez" but it links correctly without this.
+ postFixup = ''
+ sed -i 's,^Requires: bluetooth,Requires:,' $out/lib/pkgconfig/obexftp.pc
+ '';
+
+ meta = with stdenv.lib; {
homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp;
description = "A library and tool to access files on OBEX-based devices (such as Bluetooth phones)";
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = licenses.lgpl2Plus;
};
}
From 62365ecf1ab3c8d115d9e2fcb9009d7b07b35aba Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 22:45:29 +0300
Subject: [PATCH 5/6] obexfs: cleanup, add license
---
pkgs/tools/bluetooth/obexfs/default.nix | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/tools/bluetooth/obexfs/default.nix
index aeeeb4bf8d0..94c011152da 100644
--- a/pkgs/tools/bluetooth/obexfs/default.nix
+++ b/pkgs/tools/bluetooth/obexfs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, fuse, obexftp}:
+{ stdenv, fetchurl, pkgconfig, fuse, obexftp }:
stdenv.mkDerivation rec {
name = "obexfs-0.12";
@@ -8,12 +8,13 @@ stdenv.mkDerivation rec {
sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj";
};
- buildInputs = [pkgconfig fuse obexftp];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fuse obexftp ];
- NIX_LDFLAGS = "-lobexftp";
-
- meta = {
+ meta = with stdenv.lib; {
homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFs;
description = "A tool to mount OBEX-based devices (such as Bluetooth phones)";
+ platforms = platforms.linux;
+ license = licenses.lgpl2Plus;
};
}
From 08361aa43e723ed5fa1554c2dccd9f7595555c03 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 22:46:28 +0300
Subject: [PATCH 6/6] blueman: 1.23 -> 2.0.3
---
pkgs/tools/bluetooth/blueman/default.nix | 68 +++++++++++++-----------
pkgs/top-level/all-packages.nix | 3 +-
2 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 5330dfb82bd..82d9f085f78 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,43 +1,49 @@
-{ stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk
-, notify, pythonDBus, bluez, glib, gtk, libstartup_notification
-, makeWrapper, xdg_utils, obex_data_server
-, libpulseaudio
-}:
-
-stdenv.mkDerivation rec {
- name = "blueman-1.23";
+{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
+, obex_data_server, xdg_utils, libnotify, dconf
+, withPulseAudio ? true, libpulseaudio }:
+
+let
+ binPath = lib.makeBinPath [ xdg_utils ];
+
+in stdenv.mkDerivation rec {
+ name = "blueman-${version}";
+ version = "2.0.3";
src = fetchurl {
- url = "http://download.tuxfamily.org/blueman/${name}.tar.gz";
- sha256 = "04ghlh4h5bwp9mqr5jxcmjm01595l5fq5561qxvf369fvjy63cjh";
+ url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz";
+ sha256 = "09aqlk4c2qzqpmyf7b40sic7d45c1l8fyrb9f3s22b8w83j0adi4";
};
- configureFlags = "--disable-polkit";
+ nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ];
- buildInputs =
- [ pkgconfig intltool python pyrex pygobject pygtk notify pythonDBus
- bluez glib gtk libstartup_notification makeWrapper
- ];
+ buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf ]
+ ++ pythonPath
+ ++ lib.optional withPulseAudio libpulseaudio;
- # !!! Ugly.
- PYTHONPATH = "${pygobject}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${notify}/lib/${python.libPrefix}/site-packages/gtk-2.0";
+ postPatch = lib.optionalString withPulseAudio ''
+ sed -i 's,CDLL(",CDLL("${libpulseaudio}/lib/,g' blueman/main/PulseAudioUtils.py
+ '';
- postInstall =
- ''
- # Create wrappers that set the environment correctly.
- for i in $out/bin/* $out/libexec/*; do
- wrapProgram $i \
- --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \
- --set LD_LIBRARY_PATH "${libpulseaudio}/lib:" \
- --prefix PATH : ${xdg_utils}/bin
- done
+ pythonPath = with pythonPackages; [ dbus pygobject3 ];
- mkdir -p $out/nix-support
- echo ${obex_data_server} > $out/nix-support/propagated-user-env-packages
- ''; # */
+ propagatedUserEnvPkgs = [ obex_data_server ];
- meta = {
- homepage = http://blueman-project.org/;
+ configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];
+
+ postFixup = ''
+ makeWrapperArgs="\
+ --prefix PATH ':' ${binPath} \
+ --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
+ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
+ --prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules"
+ wrapPythonPrograms
+ '';
+
+ meta = with lib; {
+ homepage = https://github.com/blueman-project;
description = "GTK+-based Bluetooth Manager";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a760c007ea0..856ee80916e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1012,7 +1012,8 @@ let
bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
blueman = callPackage ../tools/bluetooth/blueman {
- inherit (pythonPackages) notify;
+ inherit (gnome3) dconf;
+ withPulseAudio = config.pulseaudio or true;
};
bmrsa = callPackage ../tools/security/bmrsa/11.nix { };