about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-12-15 05:36:24 +0100
committerJan Tojnar <jtojnar@gmail.com>2019-12-15 05:36:24 +0100
commit955be27f588347d4e380c3a31b51e822cef1b349 (patch)
tree1bb0ba0e9b8cbdcbdedfc4de7f6603598cdd2c58
parent429561978b15d72661c6133bf66650e345f91725 (diff)
downloadnixlib-955be27f588347d4e380c3a31b51e822cef1b349.tar
nixlib-955be27f588347d4e380c3a31b51e822cef1b349.tar.gz
nixlib-955be27f588347d4e380c3a31b51e822cef1b349.tar.bz2
nixlib-955be27f588347d4e380c3a31b51e822cef1b349.tar.lz
nixlib-955be27f588347d4e380c3a31b51e822cef1b349.tar.xz
nixlib-955be27f588347d4e380c3a31b51e822cef1b349.tar.zst
nixlib-955be27f588347d4e380c3a31b51e822cef1b349.zip
aegisub: fix build
-rw-r--r--pkgs/applications/video/aegisub/default.nix17
1 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 2d82f3d3e2b4..c9e30c862a83 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl
+{ config, stdenv, fetchurl, fetchpatch
 , libX11, wxGTK
 , libiconv, fontconfig, freetype
 , libGLU, libGL
@@ -29,8 +29,19 @@ stdenv.mkDerivation rec {
     sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
   };
 
-  # Fixup build with icu-59
-  postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp";
+  patches = [
+    # Compatibility with ICU 59
+    (fetchpatch {
+      url = "https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721f6ff16a49.patch";
+      sha256 = "07qqlckiyy64lz8zk1as0vflk9kqnjb340420lp9f0xj93ncssj7";
+    })
+
+    # Compatbility with Boost 1.69
+    (fetchpatch {
+      url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch";
+      sha256 = "1n8wmjka480j43b1pr30i665z8hdy6n3wdiz1ls81wyv7ai5yygf";
+    })
+  ];
 
   buildInputs = with stdenv.lib;
   [ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU libGL