about summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2017-12-02 01:16:19 +0800
committerGitHub <noreply@github.com>2017-12-02 01:16:19 +0800
commiteb0121540ebda693d324244c0f9e4347b26528cb (patch)
treeddb260426953d75ef58f96dbbb61e98880cac520 /pkgs/applications/graphics
parentbfc1141c74829f05be4d6f2a250f354de2e64900 (diff)
parent2700a588617644b0eb076fa783e2a26a2be55e75 (diff)
downloadnixlib-eb0121540ebda693d324244c0f9e4347b26528cb.tar
nixlib-eb0121540ebda693d324244c0f9e4347b26528cb.tar.gz
nixlib-eb0121540ebda693d324244c0f9e4347b26528cb.tar.bz2
nixlib-eb0121540ebda693d324244c0f9e4347b26528cb.tar.lz
nixlib-eb0121540ebda693d324244c0f9e4347b26528cb.tar.xz
nixlib-eb0121540ebda693d324244c0f9e4347b26528cb.tar.zst
nixlib-eb0121540ebda693d324244c0f9e4347b26528cb.zip
Merge pull request #32225 from bkchr/ipe
ipe: 7.1.10 -> 7.2.7
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/ipe/default.nix8
-rw-r--r--pkgs/applications/graphics/ipe/xlocale.patch10
2 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 2b1b1f8da8a6..dbd209a57a2f 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ipe-7.1.10";
+  name = "ipe-7.2.7";
 
   src = fetchurl {
-    url = "https://dl.bintray.com/otfried/generic/ipe/7.1/${name}-src.tar.gz";
-    sha256 = "0kwk8l2jasb4fdixaca08g661d0sdmx2jkk3ch7pxh0f4xkdxkkz";
+    url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
+    sha256 = "08lzqhagvr8l69hxghyw9akf5dixbily7hj2gxhzzrp334k3yvfn";
   };
 
   # changes taken from Gentoo portage
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  patches = [ ./xlocale.patch ];
+
   #TODO: make .desktop entry
 
   meta = {
diff --git a/pkgs/applications/graphics/ipe/xlocale.patch b/pkgs/applications/graphics/ipe/xlocale.patch
new file mode 100644
index 000000000000..b440831d81b4
--- /dev/null
+++ b/pkgs/applications/graphics/ipe/xlocale.patch
@@ -0,0 +1,10 @@
+--- ipe-7.2.7/src/ipelib/ipeplatform.cpp     2016-12-09 15:09:04.000000000 +0100
++++ ipe-7.2.7/src/ipelib/ipeplatform.cpp     2017-11-23 17:13:11.152395834 +0100
+@@ -38,7 +38,6 @@
+ #include <gdiplus.h>
+ #else
+ #include <sys/wait.h>
+-#include <xlocale.h>
+ #include <dirent.h>
+ #endif
+ #ifdef __APPLE__