From 2c08fe582445c8aae8133f6d2ee13ac22abc174f Mon Sep 17 00:00:00 2001 From: Javier Candeira Date: Mon, 19 Nov 2018 02:03:38 +1100 Subject: [PATCH] xmlcopyeditor: init at 1.2.1.3 * xmlcopyeditor: init at 1.2.1.3 (#38545) --- maintainers/maintainer-list.nix | 5 +++ .../editors/xmlcopyeditor/default.nix | 28 +++++++++++++++ .../editors/xmlcopyeditor/xmlcopyeditor.patch | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 71 insertions(+) create mode 100644 pkgs/applications/editors/xmlcopyeditor/default.nix create mode 100644 pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4b3361f0816..f98ac7972db 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -688,6 +688,11 @@ github = "campadrenalin"; name = "Philip Horger"; }; + candeira = { + email = "javier@candeira.com"; + github = "candeira"; + name = "Javier Candeira"; + }; canndrew = { email = "shum@canndrew.org"; github = "canndrew"; diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix new file mode 100644 index 00000000000..229e37d0080 --- /dev/null +++ b/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, aspell, boost, expat, expect, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }: + +stdenv.mkDerivation rec { + name = "xmlcopyeditor-${version}"; + version = "1.2.1.3"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "mirror://sourceforge/xml-copy-editor/${name}.tar.gz"; + sha256 = "0bwxn89600jbrkvlwyawgc0c0qqxpl453mbgcb9qbbxl8984ns4v"; + }; + + patches = [ ./xmlcopyeditor.patch ]; + CPLUS_INCLUDE_PATH = "${libxml2.dev}/include/libxml2"; + + nativeBuildInputs = [ intltool ]; + buildInputs = [ aspell boost expat libxml2 libxslt pcre wxGTK xercesc ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A fast, free, validating XML editor"; + homepage = http://xml-copy-editor.sourceforge.net/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ candeira ]; + }; +} diff --git a/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch b/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch new file mode 100644 index 00000000000..253b9ce49ba --- /dev/null +++ b/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch @@ -0,0 +1,36 @@ +From 626c385ba141c6abcff01bef4451fcad062d232c Mon Sep 17 00:00:00 2001 +From: Javier Candeira +Date: Sat, 7 Apr 2018 20:21:45 +1000 +Subject: [PATCH] nixpckgs patches + +--- + src/Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index e75918f..e04703b 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -283,8 +283,8 @@ top_srcdir = @top_srcdir@ + # these are the headers for your project + noinst_HEADERS = $(srcdir)/*.h + xmlcopyeditordir = ${prefix}/share/xmlcopyeditor +-pixmapdir = /usr/share/pixmaps +-applicationsdir = /usr/share/applications ++pixmapdir = ${prefix}/share/pixmaps ++applicationsdir = ${prefix}/share/applications + + # the application source, library search path, and link libraries + xmlcopyeditor_SOURCES = aboutdialog.cpp associatedialog.cpp binaryfile.cpp \ +@@ -357,7 +357,7 @@ EXTRA_DIST = \ + $(srcdir)/xmlcopyeditor.rc \ + $(srcdir)/xmlschemaparser.cpp + +-AM_CPPFLAGS = -I/usr/include/libxml2 $(ENCHANT_CFLAGS) $(GTK_CFLAGS) ++AM_CPPFLAGS = -I$(CPLUS_INCLUDE_PATH) $(ENCHANT_CFLAGS) $(GTK_CFLAGS) + all: all-am + + .SUFFIXES: +-- +2.16.2 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8dfb7924c91..010f8e5d4f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20053,6 +20053,8 @@ with pkgs; xmacro = callPackage ../tools/X11/xmacro { }; + xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; + xmove = callPackage ../applications/misc/xmove { }; xmp = callPackage ../applications/audio/xmp { };