libqmi: 1.0 -> 1.8.0, move outside gnome3 namespace, fix build

This commit is contained in:
Domen Kožar 2014-02-08 20:15:12 +01:00
parent bb66a3ff6c
commit 61f20ca45e
4 changed files with 23 additions and 18 deletions

View File

@ -1,16 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, python }:
stdenv.mkDerivation rec {
name = "libqmi-1.0";
src = fetchurl {
url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
sha256 = "0w4cd7nihp73frh3sfi13fx0rkwmd581xpil54bsjc7pw7z01bd1";
};
buildInputs = [ pkgconfig glib python ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

View File

@ -70,8 +70,6 @@ rec {
libpeas = callPackage ./core/libpeas {};
libqmi = callPackage ./core/libqmi {};
libgweather = callPackage ./core/libgweather { };
libzapojit = callPackage ./core/libzapojit { };

View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, pkgconfig, glib, python }:
stdenv.mkDerivation rec {
name = "libqmi-1.8.0";
src = fetchurl {
url = "http://www.freedesktop.org/software/libqmi/${name}.tar.xz";
sha256 = "03gf221yjcdzvnl4v2adwpc6cyg5mlbccn20s00fp5bgvmq81pgs";
};
preBuild = ''
patchShebangs .
'';
buildInputs = [ pkgconfig glib python ];
meta = with stdenv.lib; {
description = "Modem protocol helper library";
platforms = platforms.linux;
};
}

View File

@ -1282,6 +1282,8 @@ let
libshout = callPackage ../development/libraries/libshout { };
libqmi = callPackage ../development/libraries/libqmi { };
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
logcheck = callPackage ../tools/system/logcheck {