diff options
author | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-06-17 16:29:53 -0700 |
---|---|---|
committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-06-17 16:29:53 -0700 |
commit | 88eff1efac1f848089df11422192e3b0cc3447b5 (patch) | |
tree | 8012b11af366e7d24749635f92a099a1d1ab1176 /pkgs/applications | |
parent | 5bc8275075429764b609023fd12c4ff1dabf69f8 (diff) | |
parent | 2956b5db46d6ed21cb234a7c7ddf78cbe08df413 (diff) | |
download | nixlib-88eff1efac1f848089df11422192e3b0cc3447b5.tar nixlib-88eff1efac1f848089df11422192e3b0cc3447b5.tar.gz nixlib-88eff1efac1f848089df11422192e3b0cc3447b5.tar.bz2 nixlib-88eff1efac1f848089df11422192e3b0cc3447b5.tar.lz nixlib-88eff1efac1f848089df11422192e3b0cc3447b5.tar.xz nixlib-88eff1efac1f848089df11422192e3b0cc3447b5.tar.zst nixlib-88eff1efac1f848089df11422192e3b0cc3447b5.zip |
Merge pull request #619 from lovek323/sdcv
sdcv: add expression
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/sdcv/default.nix | 31 | ||||
-rw-r--r-- | pkgs/applications/misc/sdcv/sdcv.cpp.patch | 12 | ||||
-rw-r--r-- | pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin | 19 | ||||
-rw-r--r-- | pkgs/applications/misc/sdcv/utils.hpp.patch | 10 |
4 files changed, 72 insertions, 0 deletions
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix new file mode 100644 index 000000000000..8ac4730de9a7 --- /dev/null +++ b/pkgs/applications/misc/sdcv/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, glib, gettext }: + +stdenv.mkDerivation rec { + name= "sdcv-0.4.2"; + + meta = { + homepage = http://sdcv.sourceforge.net/; + description = "Console version of StarDict program"; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + }; + + src = fetchurl { + url = "mirror://sourceforge/sdcv/${name}.tar.bz2"; + sha256 = "1cnyv7gd1qvz8ma8545d3aq726wxrx4km7ykl97831irx5wz0r51"; + }; + + patches = ( if stdenv.isDarwin + then [ ./sdcv.cpp.patch-darwin ./utils.hpp.patch ] + else [ ./sdcv.cpp.patch ] ); + + buildInputs = [ pkgconfig glib gettext ]; + + preBuild = '' + sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp + ''; + + NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; +} + diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch b/pkgs/applications/misc/sdcv/sdcv.cpp.patch new file mode 100644 index 000000000000..6f835f16e458 --- /dev/null +++ b/pkgs/applications/misc/sdcv/sdcv.cpp.patch @@ -0,0 +1,12 @@ +--- a/src/utils.hpp ++++ b/src/utils.hpp +@@ -2,6 +2,9 @@ + #define _UTILS_HPP_ + + #include <string> ++#include <stdio.h> ++#include <cstdlib> ++ + using std::string; + + extern bool stdio_getline(FILE *in, string &str); diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin b/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin new file mode 100644 index 000000000000..2ee9a24e0347 --- /dev/null +++ b/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin @@ -0,0 +1,19 @@ +--- a/src/sdcv.cpp ++++ b/src/sdcv.cpp +@@ -27,13 +27,13 @@ + #include <cstdlib> + #include <cstdio> + #include <clocale> ++#include <string> ++#include <vector> ++#include <memory> + #include <glib.h> + #include <glib/gi18n.h> + #include <glib/gstdio.h> + #include <getopt.h> +-#include <string> +-#include <vector> +-#include <memory> + + #include "libwrapper.hpp" + #include "readline.hpp" diff --git a/pkgs/applications/misc/sdcv/utils.hpp.patch b/pkgs/applications/misc/sdcv/utils.hpp.patch new file mode 100644 index 000000000000..c08641abd6b9 --- /dev/null +++ b/pkgs/applications/misc/sdcv/utils.hpp.patch @@ -0,0 +1,10 @@ +--- a/src/utils.hpp ++++ b/src/utils.hpp +@@ -2,6 +2,7 @@ + #define _UTILS_HPP_ + + #include <string> ++#include <cstdlib> + using std::string; + + extern bool stdio_getline(FILE *in, string &str); |