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

Rename hupnp to herqq

Browse Source 
Don't pass it to kdelibs as it breaks kdelibs build

svn path=/nixpkgs/trunk/; revision=25289
This commit is contained in:
Yury G. Kudryashov 2010-12-26 17:18:13 +00:00
parent ac2b5582e2
commit e9e22a7238
5 changed files with 62 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/desktops/kde-4.6/libs/default.nix
View File

@ -2,7 +2,7 @@
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, udev, grantlee, hupnp , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, udev, grantlee
}: }:
kde.package { kde.package {
@ -10,13 +10,15 @@ kde.package {
buildInputs = [ buildInputs = [
cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info
giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver
enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell udev grantlee hupnp enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell udev grantlee
]; ];
# TODO: make sonnet plugins (dictionaries) really work. # TODO:
# * make sonnet plugins (dictionaries) really work.
# There are a few hardcoded paths. # There are a few hardcoded paths.
# Let kdelibs find openexr # * Let kdelibs find openexr
# Split plugins from libs? # * Split plugins from libs?
# * herqq: kdelibs tries to include HDeviceProxy which was never released
propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2 propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
shared_desktop_ontologies ]; shared_desktop_ontologies ];

22
pkgs/development/libraries/herqq/0.7.0.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, qt4, unzip }:
stdenv.mkDerivation rec {
name = "herqq-0.7.0";
buildInputs = [ qt4 unzip ];
configurePhase = "qmake PREFIX=$out herqq.pro";
src = fetchurl {
url = "mirror://sourceforge/hupnp/${name}.zip";
sha256 = "13z6wabakn2j57azhik9nvps50l85hrs028kkhn5cpd0pgcigmqz";
};
meta = {
homepage = http://herqq.org;
description = "A software library for building UPnP devices and control points";
inherit (qt4.meta) platforms;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}

22
pkgs/development/libraries/herqq/0.8.0.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, qt4, unzip }:
stdenv.mkDerivation rec {
name = "herqq-0.8.0";
buildInputs = [ qt4 unzip ];
configurePhase = "qmake PREFIX=$out herqq.pro";
src = fetchurl {
url = "mirror://sourceforge/hupnp/${name}.zip";
sha256 = "0z1z9f48fhdif3wd7gn2gj0yxk15f0lpm01q0igsccv8m1y3mphn";
};
meta = {
homepage = http://herqq.org;
description = "A software library for building UPnP devices and control points";
inherit (qt4.meta) platforms;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}

8
pkgs/development/libraries/hupnp/default.nix → pkgs/development/libraries/herqq/svn.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchsvn, qt4 }: { stdenv, fetchsvn, qt4 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "hupnp-0.8.0-r91"; name = "herqq-0.8.0-r91";
buildInputs = [ qt4 ]; buildInputs = [ qt4 ];
configurePhase = "cd herqq; qmake PREFIX=$out herqq.pro"; configurePhase = "qmake PREFIX=$out herqq.pro";
src = fetchsvn { src = fetchsvn {
url = http://hupnp.svn.sourceforge.net/svnroot/hupnp/trunk; url = http://hupnp.svn.sourceforge.net/svnroot/hupnp/trunk/herqq;
rev = 91; rev = 91;
sha256 = "1lhg22wy95pkxsvs6yxz4k84sslngphwf2aj5yw1bzrzzc486hqd"; sha256 = "122md1kn8b5a1vdpn5kisqi6xklwwa57r4lacm1rxlkq3rpca864";
}; };
meta = { meta = {

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

@ -3186,6 +3186,12 @@ let
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
herqqSvn = callPackage ../development/libraries/herqq/svn.nix { };
herqq070 = callPackage ../development/libraries/herqq/0.7.0.nix { };
herqq080 = callPackage ../development/libraries/herqq/0.8.0.nix { };
hspell = callPackage ../development/libraries/hspell { }; hspell = callPackage ../development/libraries/hspell { };
hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { };
@ -3194,8 +3200,6 @@ let
hunspell = callPackage ../development/libraries/hunspell { }; hunspell = callPackage ../development/libraries/hunspell { };
hupnp = callPackage ../development/libraries/hupnp { };
hwloc = callPackage ../development/libraries/hwloc { }; hwloc = callPackage ../development/libraries/hwloc { };
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };