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

Merge pull request #100463 from jonafato/gnucash-4.2

Browse Source 
gnucash: 3.10 -> 4.2
This commit is contained in:
Rok Garbas 2020-10-14 14:00:00 +02:00 committed by GitHub
commit a149c03df8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch
View File

@ -1,12 +0,0 @@
Index: gnucash-3.6/gnucash/register/register-gnome/CMakeLists.txt
===================================================================
--- gnucash-3.6.orig/gnucash/register/register-gnome/CMakeLists.txt
+++ gnucash-3.6/gnucash/register/register-gnome/CMakeLists.txt
@@ -1,6 +1,7 @@
add_subdirectory(test)
#GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK
+include(CheckSymbolExists)
check_symbol_exists(GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK gdk/gdktypes.h have_mod_mask)
if (NOT have_mod_mask)
if (MAC_INTEGRATION)

6
pkgs/applications/office/gnucash/default.nix
View File

@ -25,11 +25,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnucash"; pname = "gnucash";
version = "3.10"; version = "4.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
sha256 = "05kgg7mhizndwn7icnarqk3c19xrzfawf90y9nb3jdm6fv1741xn"; sha256 = "020k1mm909dcgs52ls4v7xx3yn8gqazi9awyr81l6y7pkq1spn2n";
}; };
nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];
@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
# glib-2.62 deprecations # glib-2.62 deprecations
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
patches = [ ./cmake_check_symbol_exists.patch ];
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
''; '';