Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 66c8169b6f56
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c08fe582445
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Nov 18, 2018

  1. xmlcopyeditor: init at 1.2.1.3

    * xmlcopyeditor: init at 1.2.1.3
    (#38545)
    candeira authored and c0bw3b committed Nov 18, 2018
    Copy the full SHA
    2c08fe5 View commit details
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -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";
28 changes: 28 additions & 0 deletions pkgs/applications/editors/xmlcopyeditor/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
36 changes: 36 additions & 0 deletions pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From 626c385ba141c6abcff01bef4451fcad062d232c Mon Sep 17 00:00:00 2001
From: Javier Candeira <javier@candeira.com>
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

2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -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 { };