diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-15 13:57:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-15 13:59:18 +0200 |
| commit | 3ee33f35f88ee8558b27f0f3cc6eb0259b312724 (patch) | |
| tree | ec4f6b2feb817cbbc2a580db7a97ecc0b299f4ee /pkgs/applications/video | |
| parent | 5a21efdcdf7c3f4349192036e661247e2cd07916 (diff) | |
| parent | 75e419173959f3e96a6569268f310e80f4f836b4 (diff) | |
| download | nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.gz nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.bz2 nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.lz nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.xz nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.zst nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.zip | |
Merge branch 'staging'
Contains security fixes in X server and X libs. On Hydra, the amount to rebuild on master is now higher than on staging; the comparison looks OK.
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/aegisub/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 39a85a03199d..ebc1249dc11d 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"; }; + # Fixup build with icu-59 + postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp"; + buildInputs = with stdenv.lib; [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa libass fftw ffms ffmpeg zlib icu boost boost.out libiconv |