summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-02-02 00:51:39 +0300
committerNikolay Amiantov <ab@fmap.me>2017-02-02 00:52:54 +0300
commit496476be4ed3d8e81213ccb7240fd91fdcf83e15 (patch)
tree1f26d1fd6d640b94aecde565dc7176a5cf216ebe /pkgs
parent8ef14f80e3d4d27644dec3d6d47152ae4b40ab07 (diff)
downloadnixlib-496476be4ed3d8e81213ccb7240fd91fdcf83e15.tar
nixlib-496476be4ed3d8e81213ccb7240fd91fdcf83e15.tar.gz
nixlib-496476be4ed3d8e81213ccb7240fd91fdcf83e15.tar.bz2
nixlib-496476be4ed3d8e81213ccb7240fd91fdcf83e15.tar.lz
nixlib-496476be4ed3d8e81213ccb7240fd91fdcf83e15.tar.xz
nixlib-496476be4ed3d8e81213ccb7240fd91fdcf83e15.tar.zst
nixlib-496476be4ed3d8e81213ccb7240fd91fdcf83e15.zip
bluez4: reintroduce to nixpkgs
It's still needed by KDE4. It was there, just unreferenced from all-packages.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/bluez/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 9943a1de6d4b..d0a875516fa3 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -5,8 +5,8 @@ assert stdenv.isLinux;
 
 let
   inherit (pythonPackages) python;
-  pythonpath = "${pythonPackages.dbus}/lib/${python.libPrefix}/site-packages:"
-    + "${pythonPackages.pygobject}/lib/${python.libPrefix}/site-packages";
+  pythonpath = "${pythonPackages.dbus-python}/lib/${python.libPrefix}/site-packages:"
+    + "${pythonPackages.pygobject2}/lib/${python.libPrefix}/site-packages";
 in stdenv.mkDerivation rec {
   name = "bluez-4.101";
    
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90e44c9819ac..fcb3ec9ceec0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10848,6 +10848,8 @@ with pkgs;
 
   bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { };
 
+  bluez4 = callPackage ../os-specific/linux/bluez { };
+
   # Needed for LibreOffice
   bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { });