summary refs log tree commit diff
path: root/pkgs/tools/video/swftools
diff options
context:
space:
mode:
authorkoral <koral@mailoo.org>2015-01-26 12:05:37 +0100
committerkoral <koral@mailoo.org>2015-01-26 12:05:37 +0100
commit0490d597df5d12c1aeddeb1ef85b868a445de4b3 (patch)
tree77edeed0f50ce988e24bdb21e0577e05b6f9918a /pkgs/tools/video/swftools
parent5e7501cd41ebe17f32c8867f01d1b77f349d17eb (diff)
downloadnixpkgs-0490d597df5d12c1aeddeb1ef85b868a445de4b3.tar
nixpkgs-0490d597df5d12c1aeddeb1ef85b868a445de4b3.tar.gz
nixpkgs-0490d597df5d12c1aeddeb1ef85b868a445de4b3.tar.bz2
nixpkgs-0490d597df5d12c1aeddeb1ef85b868a445de4b3.tar.lz
nixpkgs-0490d597df5d12c1aeddeb1ef85b868a445de4b3.tar.xz
nixpkgs-0490d597df5d12c1aeddeb1ef85b868a445de4b3.tar.zst
nixpkgs-0490d597df5d12c1aeddeb1ef85b868a445de4b3.zip
swftools: 0.8.1 -> 0.9.2
Diffstat (limited to 'pkgs/tools/video/swftools')
-rw-r--r--pkgs/tools/video/swftools/default.nix21
-rw-r--r--pkgs/tools/video/swftools/swftools.patch17
2 files changed, 30 insertions, 8 deletions
diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix
index 0a658a23e1c..b185d859093 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 00000000000..c7eb89f9b3e
--- /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