diff options
| -rw-r--r-- | pkgs/development/libraries/htmlcxx/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/htmlcxx/ptrdiff.patch | 13 | ||||
| -rw-r--r-- | pkgs/games/lgogdownloader/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 66 insertions, 0 deletions
diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix new file mode 100644 index 000000000000..63cc74773855 --- /dev/null +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "htmlcxx-${version}"; + version = "0.85"; + + src = fetchurl { + url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz"; + sha256 = "1rdsjrcjkf7mi3182lq4v5wn2wncw0ziczagaqnzi0nwmp2a00mb"; + }; + + patches = [ ./ptrdiff.patch ]; + + meta = { + homepage = http://htmlcxx.sourceforge.net/; + description = "htmlcxx is a simple non-validating css1 and html parser for C++."; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/pkgs/development/libraries/htmlcxx/ptrdiff.patch new file mode 100644 index 000000000000..6348ba24f8da --- /dev/null +++ b/pkgs/development/libraries/htmlcxx/ptrdiff.patch @@ -0,0 +1,13 @@ +diff -rc htmlcxx-orig-0.85/html/tree.h htmlcxx-0.85/html/tree.h +*** htmlcxx-orig-0.85/html/tree.h 2015-09-02 13:57:17.988688798 +0200 +--- htmlcxx-0.85/html/tree.h 2015-09-02 13:57:52.737768811 +0200 +*************** +*** 45,50 **** +--- 45,51 ---- + #ifndef tree_hh_ + #define tree_hh_ + ++ #include <cstddef> + #include <cassert> + #include <memory> + #include <stdexcept> diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix new file mode 100644 index 000000000000..4ef3e533772d --- /dev/null +++ b/pkgs/games/lgogdownloader/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, curl, boost, jsoncpp, liboauth, rhash, tinyxml, htmlcxx, help2man }: + +stdenv.mkDerivation rec { + name = "lgogdownloader-${version}"; + version = "2.24"; + + src = fetchgit { + url = "https://github.com/Sude-/lgogdownloader.git"; + rev = "refs/tags/v${version}"; + sha256 = "1h5l4zc22hj4all2w0vfby1rmhpca33g3bhdnqw11w2ligk8j14r"; + }; + + buildInputs = [ curl boost jsoncpp liboauth rhash tinyxml htmlcxx help2man ]; + + buildPhase = '' + make release + ''; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = { + homepage = https://github.com/Sude-/lgogdownloader; + description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader."; + license = stdenv.lib.licenses.wtfpl; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 984485e893cb..c99a1d67f884 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6657,6 +6657,8 @@ let hstr = callPackage ../applications/misc/hstr { }; + htmlcxx = callPackage ../development/libraries/htmlcxx { }; + http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; hunspell = callPackage ../development/libraries/hunspell { }; @@ -13793,6 +13795,8 @@ let kobodeluxe = callPackage ../games/kobodeluxe { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; + lincity = builderDefsPackage (import ../games/lincity) { inherit (xlibs) libX11 libXext xextproto libICE libSM xproto; |