xmlcopyeditor: 1.2.1.3 -> 1.3.1.0

+43 -35
+37 -10
pkgs/applications/editors/xmlcopyeditor/default.nix
··· 1 - { lib, stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }: 2 3 stdenv.mkDerivation rec { 4 pname = "xmlcopyeditor"; 5 - version = "1.2.1.3"; 6 7 src = fetchurl { 8 - name = "${pname}-${version}.tar.gz"; 9 url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz"; 10 - sha256 = "0bwxn89600jbrkvlwyawgc0c0qqxpl453mbgcb9qbbxl8984ns4v"; 11 }; 12 13 patches = [ ./xmlcopyeditor.patch ]; 14 - CPLUS_INCLUDE_PATH = "${libxml2.dev}/include/libxml2"; 15 16 - nativeBuildInputs = [ intltool ]; 17 - buildInputs = [ aspell boost expat libxml2 libxslt pcre wxGTK xercesc ]; 18 19 enableParallelBuilding = true; 20 21 meta = with lib; { 22 description = "A fast, free, validating XML editor"; 23 - homepage = "http://xml-copy-editor.sourceforge.net/"; 24 license = licenses.gpl2Plus; 25 - platforms = platforms.linux; 26 - maintainers = with maintainers; [ candeira ]; 27 }; 28 }
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , aspell 5 + , boost 6 + , expat 7 + , intltool 8 + , pkg-config 9 + , libxml2 10 + , libxslt 11 + , pcre2 12 + , wxGTK32 13 + , xercesc 14 + , Cocoa 15 + }: 16 17 stdenv.mkDerivation rec { 18 pname = "xmlcopyeditor"; 19 + version = "1.3.1.0"; 20 21 src = fetchurl { 22 url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz"; 23 + sha256 = "sha256-6HHKl7hqyvF3gJ9vmjLjTT49prJ8KhEEV0qPsJfQfJE="; 24 }; 25 26 patches = [ ./xmlcopyeditor.patch ]; 27 + 28 + nativeBuildInputs = [ 29 + intltool 30 + pkg-config 31 + ]; 32 33 + buildInputs = [ 34 + aspell 35 + boost 36 + expat 37 + libxml2 38 + libxslt 39 + pcre2 40 + wxGTK32 41 + xercesc 42 + ] ++ lib.optionals stdenv.isDarwin [ 43 + Cocoa 44 + ]; 45 46 enableParallelBuilding = true; 47 48 meta = with lib; { 49 description = "A fast, free, validating XML editor"; 50 + homepage = "https://xml-copy-editor.sourceforge.io/"; 51 license = licenses.gpl2Plus; 52 + platforms = platforms.unix; 53 + maintainers = with maintainers; [ candeira wegank ]; 54 }; 55 }
+3 -24
pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch
··· 1 - From 626c385ba141c6abcff01bef4451fcad062d232c Mon Sep 17 00:00:00 2001 2 - From: Javier Candeira <javier@candeira.com> 3 - Date: Sat, 7 Apr 2018 20:21:45 +1000 4 - Subject: [PATCH] nixpckgs patches 5 - 6 - --- 7 - src/Makefile.in | 6 +++--- 8 - 1 file changed, 3 insertions(+), 3 deletions(-) 9 - 10 diff --git a/src/Makefile.in b/src/Makefile.in 11 - index e75918f..e04703b 100644 12 --- a/src/Makefile.in 13 +++ b/src/Makefile.in 14 - @@ -283,8 +283,8 @@ top_srcdir = @top_srcdir@ 15 # these are the headers for your project 16 noinst_HEADERS = $(srcdir)/*.h 17 xmlcopyeditordir = ${prefix}/share/xmlcopyeditor ··· 21 +applicationsdir = ${prefix}/share/applications 22 23 # the application source, library search path, and link libraries 24 - xmlcopyeditor_SOURCES = aboutdialog.cpp associatedialog.cpp binaryfile.cpp \ 25 - @@ -357,7 +357,7 @@ EXTRA_DIST = \ 26 - $(srcdir)/xmlcopyeditor.rc \ 27 - $(srcdir)/xmlschemaparser.cpp 28 - 29 - -AM_CPPFLAGS = -I/usr/include/libxml2 $(ENCHANT_CFLAGS) $(GTK_CFLAGS) 30 - +AM_CPPFLAGS = -I$(CPLUS_INCLUDE_PATH) $(ENCHANT_CFLAGS) $(GTK_CFLAGS) 31 - all: all-am 32 - 33 - .SUFFIXES: 34 - -- 35 - 2.16.2 36 -
··· 1 diff --git a/src/Makefile.in b/src/Makefile.in 2 + index e2b01fc..7f3a21e 100644 3 --- a/src/Makefile.in 4 +++ b/src/Makefile.in 5 + @@ -427,8 +427,8 @@ top_srcdir = @top_srcdir@ 6 # these are the headers for your project 7 noinst_HEADERS = $(srcdir)/*.h 8 xmlcopyeditordir = ${prefix}/share/xmlcopyeditor ··· 12 +applicationsdir = ${prefix}/share/applications 13 14 # the application source, library search path, and link libraries 15 + xmlcopyeditor_SOURCES = aboutdialog.cpp \
+3 -1
pkgs/top-level/all-packages.nix
··· 33157 33158 xmenu = callPackage ../applications/misc/xmenu { }; 33159 33160 - xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; 33161 33162 xmp = callPackage ../applications/audio/xmp { }; 33163
··· 33157 33158 xmenu = callPackage ../applications/misc/xmenu { }; 33159 33160 + xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { 33161 + inherit (darwin.apple_sdk.frameworks) Cocoa; 33162 + }; 33163 33164 xmp = callPackage ../applications/audio/xmp { }; 33165