diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-03-15 23:09:07 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-03-15 23:09:07 +0000 |
| commit | a9eb45ae180950976222c794cfc535d97f26aa47 (patch) | |
| tree | c8147c2eb9e96af1bd2a8ca6b443d2de468699c4 /pkgs | |
| parent | ba3c547f6dd9de2d099fd88b35f6a2f0917f84a7 (diff) | |
| download | nixpkgs-a9eb45ae180950976222c794cfc535d97f26aa47.tar nixpkgs-a9eb45ae180950976222c794cfc535d97f26aa47.tar.gz nixpkgs-a9eb45ae180950976222c794cfc535d97f26aa47.tar.bz2 nixpkgs-a9eb45ae180950976222c794cfc535d97f26aa47.tar.lz nixpkgs-a9eb45ae180950976222c794cfc535d97f26aa47.tar.xz nixpkgs-a9eb45ae180950976222c794cfc535d97f26aa47.tar.zst nixpkgs-a9eb45ae180950976222c794cfc535d97f26aa47.zip | |
Add bluedevil
svn path=/nixpkgs/trunk/; revision=26333
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libbluedevil/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/tools/bluetooth/bluedevil/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix new file mode 100644 index 00000000000..4b233437adb --- /dev/null +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchgit, cmake, qt4 }: + +stdenv.mkDerivation rec { + name = "libbluedevil-20110304"; + + src = fetchgit { + url = git://anongit.kde.org/libbluedevil.git; + rev = "b44537b1784528cacc62ab1d570c1565bd326b4f"; + sha256 = "15rx44dncg7hm2x04yz53ni4l1fpb40c3bma3pbvr7l2yd89x3sa"; + }; + + buildInputs = [ cmake qt4 ]; +} diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix new file mode 100644 index 00000000000..287036f3e0a --- /dev/null +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchgit, cmake, automoc4, kdelibs, libbluedevil, shared_mime_info }: + +stdenv.mkDerivation rec { + name = "bluedevil-20110303"; + + src = fetchgit { + url = git://anongit.kde.org/bluedevil.git; + sha256 = "1chx3cx43wic1sgzc651vxxiy9khbp9hcm7n40nmhnj9czfcg46q"; + rev = "7e513008aa6430d3b8d0052b14201d1d813c80b9"; + }; + + buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 ]; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d6c03603c9..0dfa4b5817d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -408,6 +408,8 @@ let bfr = callPackage ../tools/misc/bfr { }; + bluedevil = newScope pkgs.kde4 ../tools/bluetooth/bluedevil { }; + bootchart = callPackage ../tools/system/bootchart { }; btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) { @@ -3373,6 +3375,8 @@ let libavc1394 = callPackage ../development/libraries/libavc1394 { }; + libbluedevil = callPackage ../development/libraries/libbluedevil { }; + libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { |