From 0490d597df5d12c1aeddeb1ef85b868a445de4b3 Mon Sep 17 00:00:00 2001 From: koral Date: Mon, 26 Jan 2015 12:05:37 +0100 Subject: [PATCH] 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