diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix new file mode 100644 index 000000000000..0808857e1152 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, qoauth +, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }: + +stdenv.mkDerivation rec { + name = "libgdata-0.14.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libgdata/0.14/${name}.tar.xz"; + sha256 = "1scjs944kjazbsh86kdj6w2vprib6yd3wzxzabcs59acmr0m4hax"; + }; + + + NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; + + buildInputs = with gnome3; + [ pkgconfig libsoup intltool libxml2 glib qoauth gobjectIntrospection + liboauth gcr gnome_online_accounts p11_kit openssl ]; + + meta = with stdenv.lib; { + description = "GData API library"; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; + +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 47656da09925..7f2ed9acb1ac 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -61,6 +61,8 @@ rec { libgee = callPackage ./core/libgee { }; + libgdata = callPackage ./core/libgdata { }; + libgxps = callPackage ./core/libgxps { }; libpeas = callPackage ./core/libpeas {}; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix deleted file mode 100644 index 368d873e52a1..000000000000 --- a/pkgs/development/libraries/libgdata/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -x@{builderDefsPackage - , glib, libsoup, libxml2, pkgconfig, intltool, perl - , libtasn1, nettle, gmp - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="libgdata"; - majorVersion="0.8"; - minorVersion="1"; - version="${majorVersion}.${minorVersion}"; - name="${baseName}-${version}"; - url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.bz2"; - hash="1ffhd1dvjflwjsiba1qdianlzfdlfkjgifmw3c7qs2g6fzkf62q8"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - meta = { - description = "GData API library"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.lgpl21Plus; - }; - passthru = { - updateInfo = { - downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/${sourceInfo.baseName}"; - }; - }; -}) x - diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix new file mode 100644 index 000000000000..5a3b54544b54 --- /dev/null +++ b/pkgs/development/libraries/liboauth/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, nss, openssl, pkgconfig }: + + +stdenv.mkDerivation rec { + name = "liboauth-1.0.1"; + + src = fetchurl { + url = "mirror://sourceforge/liboauth/${name}.tar.gz"; + sha256 = "12wdwq09nba8dzzcgcpbzmgcjr141ky69pm78s15hyyvw4px71sh"; + }; + + buildInputs = [ nss openssl ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + description = "C library implementing the OAuth secure authentication protocol"; + homepage = http://liboauth.sourceforge.net/; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1313ad12ba1b..533d365ac304 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1266,6 +1266,8 @@ let libestr = callPackage ../development/libraries/libestr { }; + liboauth = callPackage ../development/libraries/liboauth { }; + libtirpc = callPackage ../development/libraries/ti-rpc { }; libshout = callPackage ../development/libraries/libshout { }; @@ -4615,8 +4617,7 @@ let libgadu = callPackage ../development/libraries/libgadu { }; - libgdata = (newScope gnome) ../development/libraries/libgdata {}; - libgdata_0_6 = (newScope gnome) ../development/libraries/libgdata/0.6.nix {}; + libgdata = gnome3.libgdata; libgig = callPackage ../development/libraries/libgig { };