nur-packages

commit b8239b954a19e74fd91d80c191899e84afbe64b6
parent 5aa4e2984d1f3e4b5ad4e99212809fae62029914
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Fri, 28 Feb 2020 19:04:04 +0300

mapsoft2: add SKIP_IMG_DIFFS=1

Diffstat:
M
pkgs/applications/mapsoft/0002-fix-build.patch
 | 
25
-------------------------
M
pkgs/applications/mapsoft/2.nix
 | 
2
++

2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/pkgs/applications/mapsoft/0002-fix-build.patch b/pkgs/applications/mapsoft/0002-fix-build.patch
@@ -15,19 +15,6 @@ index 3ff6a7a..da19730 100644
  override CXXFLAGS += -std=gnu++11 -Werror=return-type -O2 -fPIC
  override CXXFLAGS += -I$(MODDIR)
  
-diff --git i/modules/cairo/Makefile w/modules/cairo/Makefile
-index 30aa283..d9e0b79 100644
---- i/modules/cairo/Makefile
-+++ w/modules/cairo/Makefile
-@@ -1,7 +1,7 @@
- MOD_SOURCES := cairo_wrapper.cpp
- MOD_HEADERS := cairo_wrapper.h
- 
--SCRIPT_TESTS := cairo1
-+#SCRIPT_TESTS := cairo1
- PKG_CONFIG := gtkmm-3.0 fontconfig cairomm-1.0 cairomm-ft-1.0
- 
- include ../Makefile.inc
 diff --git i/modules/pc/libdb.pc w/modules/pc/libdb.pc
 index 6a40e95..682c932 100644
 --- i/modules/pc/libdb.pc
@@ -74,15 +61,3 @@ index d44adac..c0b361e 100644
  
  PKG_CONFIG   := libzip
  
-diff --git i/programs/ms2conv/Makefile w/programs/ms2conv/Makefile
-index 6adf510..57d2d38 100644
---- i/programs/ms2conv/Makefile
-+++ w/programs/ms2conv/Makefile
-@@ -7,7 +7,6 @@ OTHER_TESTS :=\
-   ms2conv.test5\
-   ms2conv.test6\
-   ms2conv.test7\
--  ms2conv.test_img\
-   ms2conv.test_mkref
- 
- MODDIR := ../../modules
diff --git a/pkgs/applications/mapsoft/2.nix b/pkgs/applications/mapsoft/2.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
 
   dontConfigure = true;
 
+  preBuild = "export SKIP_IMG_DIFFS=1";
+
   makeFlags = [ "prefix=${placeholder "out"}" ];
 
   meta = with stdenv.lib; {