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

gpscorrelate: unstable-2019-09-03 -> 2.0

Browse Source
This commit is contained in:
Nikolay Korotkiy 2019-10-29 19:21:11 +03:00 committed by Lassulus
parent 801e8b4d72
commit 855c1e09c8
2 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/gpscorrelate/default.nix
View File

@ -3,17 +3,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gpscorrelate"; pname = "gpscorrelate";
version = "unstable-2019-09-03"; version = "2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dfandrich"; owner = "dfandrich";
repo = pname; repo = pname;
rev = "e1dd44a34f67b1ab7201440e60a840258ee448d2"; rev = version;
sha256 = "0gjwwdqh9dprzylmmnk3gm41khka9arkij3i9amd8y7d49pm9rlv"; sha256 = "1wkpb0nqnm0ik46hp2sibf96h2gxi6n951zm8c72scgmh4ciq4fl";
}; };
patches = [ ./fix-localedir.diff ];
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
docbook_xml_dtd_42 docbook_xml_dtd_42
@ -30,7 +28,6 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"prefix=${placeholder "out"}" "prefix=${placeholder "out"}"
"GTK=3"
"CC=cc" "CC=cc"
"CXX=c++" "CXX=c++"
"CFLAGS=-DENABLE_NLS" "CFLAGS=-DENABLE_NLS"
@ -60,7 +57,7 @@ stdenv.mkDerivation rec {
''; '';
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
homepage = "https://github.com/dfandrich/gpscorrelate"; homepage = "https://dfandrich.github.io/gpscorrelate/";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ sikmir ]; maintainers = with maintainers; [ sikmir ];
}; };

27
pkgs/applications/misc/gpscorrelate/fix-localedir.diff
View File

@ -1,27 +0,0 @@
diff --git i/Makefile w/Makefile
index 47919ca..408fd68 100644
--- i/Makefile
+++ w/Makefile
@@ -33,8 +33,9 @@ datadir = $(prefix)/share
mandir = $(datadir)/man
docdir = $(datadir)/doc/gpscorrelate
applicationsdir = $(datadir)/applications
+localedir = ${datadir}/locale
-DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
+DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
TARGETS = gpscorrelate-gui$(EXEEXT) gpscorrelate$(EXEEXT) doc/gpscorrelate.1 doc/gpscorrelate.html
diff --git i/main-gui.c w/main-gui.c
index fdace6f..8a6197b 100644
--- i/main-gui.c
+++ w/main-gui.c
@@ -40,6 +40,7 @@
int main(int argc, char* argv[])
{
/* Initialize gettext (gtk_init initializes the locale) */
+ (void) bindtextdomain(TEXTDOMAIN, PACKAGE_LOCALE_DIR);
(void) textdomain(TEXTDOMAIN);
(void) bind_textdomain_codeset(TEXTDOMAIN, "UTF-8");