From 1b3553863aaf36082699d0e1eaae7624de995ea4 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Mon, 26 Jan 2015 12:05:37 +0100
Subject: [PATCH 1/2] swftools: 0.8.1 -> 0.9.2

---
 pkgs/tools/video/swftools/default.nix    | 21 +++++++++++++--------
 pkgs/tools/video/swftools/swftools.patch | 17 +++++++++++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/tools/video/swftools/swftools.patch

diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix
index 0a658a23e1cf..b185d8590930 100644
--- a/pkgs/tools/video/swftools/default.nix
+++ b/pkgs/tools/video/swftools/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, fetchurl, freetype, libjpeg, libungif, zlib }:
 
-stdenv.mkDerivation {
-  name = "swftools-0.8.1";
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "swftools-${version}";
+  version = "0.9.2";
 
   src = fetchurl {
-    url = http://www.swftools.org/swftools-0.8.1.tar.gz;
-    sha256 = "0l75c3ibwd24g9nqghp1rv1dfrlicw87s0rbdnyffjv4izz6gc2l";
+    url = "http://www.swftools.org/${name}.tar.gz";
+    sha256 = "1w81dyi81019a6jmnm5z7fzarswng27lg1d4k4d5llxzqszr2s5z";
   };
 
-  buildInputs = [ zlib ];
+  patches = [ ./swftools.patch ];
 
-  meta = { 
+  buildInputs = [ freetype libjpeg libungif zlib ];
+
+  meta = {
     description = "Collection of SWF manipulation and creation utilities";
     homepage = http://www.swftools.org/about.html;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.koral ];
   };
 }
diff --git a/pkgs/tools/video/swftools/swftools.patch b/pkgs/tools/video/swftools/swftools.patch
new file mode 100644
index 000000000000..c7eb89f9b3e0
--- /dev/null
+++ b/pkgs/tools/video/swftools/swftools.patch
@@ -0,0 +1,17 @@
+--- a/swfs/Makefile.in.orig
++++ b/swfs/Makefile.in
+@@ -41,10 +41,10 @@ install:
+ 	$(INSTALL_DATA) ./PreLoaderTemplate.swf $(pkgdatadir)/swfs/PreLoaderTemplate.swf
+ 	$(INSTALL_DATA) ./tessel_loader.swf $(pkgdatadir)/swfs/tessel_loader.swf
+ 	$(INSTALL_DATA) ./swft_loader.swf $(pkgdatadir)/swfs/swft_loader.swf
+-	rm -f $(pkgdatadir)/swfs/default_viewer.swf -o -L $(pkgdatadir)/swfs/default_viewer.swf
+-	$(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf
+-	rm -f $(pkgdatadir)/swfs/default_loader.swf -o -L $(pkgdatadir)/swfs/default_loader.swf
+-	$(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf
++	rm -f $(pkgdatadir)/swfs/default_viewer.swf # -o -L $(pkgdatadir)/swfs/default_viewer.swf
++	$(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf
++	rm -f $(pkgdatadir)/swfs/default_loader.swf # -o -L $(pkgdatadir)/swfs/default_loader.swf
++	$(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf
+ 		
+ uninstall:
+ 	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/simple_viewer.swf

From 400adb7ec49d80b6e33d49a7f0fd22117d8ea3e5 Mon Sep 17 00:00:00 2001
From: skityl <mopofhair@gmail.com>
Date: Tue, 27 Jan 2015 00:29:52 +1100
Subject: [PATCH 2/2] Bumped version of irssi-0.8.16 to irssi-0.8.17

Signed-off-by: skityl <mopofhair@gmail.com>
---
 pkgs/applications/networking/irc/irssi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 8d8913cf3cd6..47754db1f2d5 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = "irssi-0.8.16";
+  name = "irssi-0.8.17";
   
   src = fetchurl {
     url = "http://irssi.org/files/${name}.tar.bz2";
-    sha256 = "15wzs4h754jzs1l4z7qzsyjllk9wdx3qfb6gymdiykvmlb9gwyiz";
+    sha256 = "01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw";
   };
   
   buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];