JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1496 from bennofs/fix-gupnp-tools

Browse Source 
gupnp-tools and releated packages: fix and update
This commit is contained in:
Domen Kožar 2014-01-30 10:06:05 -08:00
commit 01ac860100
8 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/default.nix
View File

@ -8,10 +8,6 @@ rec {
orbit = ORBit2;
#### Overrides of libraries
libsoup = pkgs.libsoup_2_44;
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
at_spi2_atk = callPackage ./core/at-spi2-atk { };

4
pkgs/development/libraries/gssdp/default.nix
View File

@ -4,8 +4,8 @@ stdenv.mkDerivation {
name = "gssdp-0.12.2.1";
src = fetchurl {
url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.2.1.tar.xz;
sha256 = "0544f9nv6dpnfd0qbmxm8xwqjh8dafcmf3vlzkdly12xh5bs52lj";
url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.6.tar.xz;
sha256 = "1kgakr0rpdpm7nkp4ycka12nndga16wmzim79v1nbcc0j2wxxkws";
};
buildInputs = [pkgconfig libsoup glib libxml2];

21
pkgs/development/libraries/gupnp-av/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, gupnp, pkgconfig }:
stdenv.mkDerivation rec {
name = "gupnp-av-${version}";
majorVersion = "0.12";
version = "${majorVersion}.4";
src = fetchurl {
url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz";
sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl";
};
buildInputs = [ gupnp pkgconfig ];
meta = {
homepage = http://gupnp.org/;
description = "GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP.";
longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework.";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

20
pkgs/development/libraries/gupnp/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
stdenv.mkDerivation {
name = "gupnp-0.18.4";
stdenv.mkDerivation rec {
name = "gupnp-${version}";
majorVersion = "0.20";
version = "${majorVersion}.9";
src = fetchurl {
url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.4.tar.xz;
sha256 = "18bqmy8r44fnga9wz9inlq6k2s0292bnnql0c0n2j4mj25bpshvb";
url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1";
};
propagatedBuildInputs = [ libxml2 libsoup gssdp ];
@ -13,7 +14,16 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
postInstall = ''
cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include
cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include
cp -r ${libxml2}/include/libxml2/libxml $out/include
'';
meta = {
homepage = http://www.gupnp.org/;
description = "GUPnP is an implementation of the UPnP specification.";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

35
pkgs/development/libraries/libsoup/2.44.nix
View File

@ -1,35 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, python, gobjectIntrospection
, glib, libxml2, sqlite, glib_networking
, gnomeSupport ? true, libgnome_keyring
}:
stdenv.mkDerivation {
name = "libsoup-2.44.2";
meta = {
description = "HTTP client/server library";
license = stdenv.lib.licenses.lgpl2Plus;
};
src = fetchurl {
url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz;
sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77";
};
preConfigure = ''
substituteInPlace libsoup/tld-parser.py \
--replace "!/usr/bin/env python" "!${python}/bin/${python.executable}"
'';
nativeBuildInputs = [ pkgconfig intltool python gobjectIntrospection ];
propagatedBuildInputs = [ glib libxml2 sqlite ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
passthru.propagatedUserEnvPackages = [ glib_networking ];
# glib_networking is a runtime dependency, not a compile-time dependency
configureFlags = "--disable-tls-check";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
}

18
pkgs/development/libraries/libsoup/default.nix
View File

@ -1,17 +1,23 @@
{ stdenv, fetchurl, glib, libxml2, pkgconfig
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking
, libintlOrEmpty }:
, libintlOrEmpty
, intltool, python }:
stdenv.mkDerivation {
name = "libsoup-2.38.1";
stdenv.mkDerivation rec {
name = "libsoup-${version}";
majorVersion = "2.45";
version = "${majorVersion}.3";
src = fetchurl {
url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz;
sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i";
url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva";
};
patchPhase = ''
patchShebangs libsoup/
'';
buildInputs = libintlOrEmpty;
buildInputs = libintlOrEmpty ++ [ intltool python ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];

17
pkgs/tools/networking/gupnp-tools/default.nix
View File

@ -1,11 +1,18 @@
{fetchurl, stdenv, gupnp, gssdp, pkgconfig, glib, libxml2, libsoup, gtk, libglade, gnomeicontheme, e2fsprogs}:
{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}:
stdenv.mkDerivation rec {
name = "gupnp-tools-0.6";
name = "gupnp-tools-${version}";
majorVersion = "0.8";
version = "${majorVersion}.8";
src = fetchurl {
url = "http://www.gupnp.org/sources/gupnp-tools/gupnp-tools-0.6.tar.gz";
sha256 = "08fnggk85zqdcvm4np53yxw15b3ck25c2rmyfrh04g8j25qf50dj";
url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz";
sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij";
};
buildInputs = [gupnp gssdp pkgconfig glib libxml2 libsoup gtk libglade gnomeicontheme e2fsprogs];
buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av gnome3.gnome_icon_theme gnome3.gnome_themes_standard makeWrapper];
postInstall = ''
wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share"
wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share"
'';
}

12
pkgs/top-level/all-packages.nix
View File

@ -1101,11 +1101,11 @@ let
inherit (gnome) libsoup;
};
gupnp_av = callPackage ../development/libraries/gupnp-av {};
gupnp_igd = callPackage ../development/libraries/gupnp-igd {};
gupnptools = callPackage ../tools/networking/gupnp-tools {
inherit (gnome) libsoup libglade gnomeicontheme;
};
gupnptools = callPackage ../tools/networking/gupnp-tools {};
gvpe = builderDefsPackage ../tools/networking/gvpe {
inherit openssl gmp nettools iproute;
@ -4120,9 +4120,7 @@ let
geoclue = callPackage ../development/libraries/geoclue {};
geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {
libsoup = libsoup_2_44;
};
geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
geoip = builderDefsPackage ../development/libraries/geoip {
inherit zlib;
@ -4928,7 +4926,6 @@ let
libsodium = callPackage ../development/libraries/libsodium { };
libsoup = callPackage ../development/libraries/libsoup { };
libsoup_2_44 = callPackage ../development/libraries/libsoup/2.44.nix { };
libssh = callPackage ../development/libraries/libssh { };
@ -5734,7 +5731,6 @@ let
};
webkitgtk = callPackage ../development/libraries/webkitgtk {
libsoup = libsoup_2_44;
harfbuzz = harfbuzz.override {
withIcu = true;
};