diff options
author | Pallav Agarwal <pallavag@google.com> | 2017-11-10 23:34:00 +0530 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-11-11 01:32:34 +0000 |
commit | 46336b6961b7a674491b04454bb0d449fbe5bf6e (patch) | |
tree | 5d946488d26f06082b9daa703070c697c0a524e0 /pkgs/applications/misc/sdcv | |
parent | 0fddfcdd4ddec01fc8dcb099557c322cd615b3df (diff) | |
download | nixlib-46336b6961b7a674491b04454bb0d449fbe5bf6e.tar nixlib-46336b6961b7a674491b04454bb0d449fbe5bf6e.tar.gz nixlib-46336b6961b7a674491b04454bb0d449fbe5bf6e.tar.bz2 nixlib-46336b6961b7a674491b04454bb0d449fbe5bf6e.tar.lz nixlib-46336b6961b7a674491b04454bb0d449fbe5bf6e.tar.xz nixlib-46336b6961b7a674491b04454bb0d449fbe5bf6e.tar.zst nixlib-46336b6961b7a674491b04454bb0d449fbe5bf6e.zip |
sdcv: 0.4.2 -> 0.5.2
Diffstat (limited to 'pkgs/applications/misc/sdcv')
-rw-r--r-- | pkgs/applications/misc/sdcv/default.nix | 45 | ||||
-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, 21 insertions, 65 deletions
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index a538e53276bd..bf2de3a5f1b9 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -1,35 +1,32 @@ -{ stdenv, fetchurl, pkgconfig, glib, gettext }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }: 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.linux; - }; - - src = fetchurl { - url = "mirror://sourceforge/sdcv/${name}.tar.bz2"; - sha256 = "1cnyv7gd1qvz8ma8545d3aq726wxrx4km7ykl97831irx5wz0r51"; + name = "sdcv-${version}"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "Dushistov"; + repo = "sdcv"; + rev = "v${version}"; + sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0"; }; hardeningDisable = [ "format" ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ glib gettext readline ]; - patches = ( if stdenv.isDarwin - then [ ./sdcv.cpp.patch-darwin ./utils.hpp.patch ] - else [ ./sdcv.cpp.patch ] ); - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gettext ]; - - preBuild = '' - sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp + preInstall = '' + touch locale ''; NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__" + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; -} + meta = with stdenv.lib; { + homepage = https://dushistov.github.io/sdcv/; + description = "Console version of StarDict"; + maintainers = with maintainers; [ lovek323 ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch b/pkgs/applications/misc/sdcv/sdcv.cpp.patch deleted file mode 100644 index 6f835f16e458..000000000000 --- a/pkgs/applications/misc/sdcv/sdcv.cpp.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index 2ee9a24e0347..000000000000 --- a/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index c08641abd6b9..000000000000 --- a/pkgs/applications/misc/sdcv/utils.hpp.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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); |