summary refs log tree commit diff
path: root/pkgs/tools/graphics
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-05 12:11:18 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-05 12:11:18 +0000
commit6ed314755016c8b231b51a0c8203998136cb14ea (patch)
tree0c5a20ddec40f01caf7f5abe115afe403f850098 /pkgs/tools/graphics
parentbdb01cc7078e643ece0c36ba7c9dfe44b7f13124 (diff)
parente0488019665c24a7694ce31a3d70c284ff519caa (diff)
downloadnixlib-6ed314755016c8b231b51a0c8203998136cb14ea.tar
nixlib-6ed314755016c8b231b51a0c8203998136cb14ea.tar.gz
nixlib-6ed314755016c8b231b51a0c8203998136cb14ea.tar.bz2
nixlib-6ed314755016c8b231b51a0c8203998136cb14ea.tar.lz
nixlib-6ed314755016c8b231b51a0c8203998136cb14ea.tar.xz
nixlib-6ed314755016c8b231b51a0c8203998136cb14ea.tar.zst
nixlib-6ed314755016c8b231b51a0c8203998136cb14ea.zip
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31311
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r--pkgs/tools/graphics/icoutils/default.nix19
-rw-r--r--pkgs/tools/graphics/pngtoico/default.nix23
2 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix
new file mode 100644
index 000000000000..5abc909ea306
--- /dev/null
+++ b/pkgs/tools/graphics/icoutils/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, libpng }:
+
+stdenv.mkDerivation rec {
+  name = "icoutils-0.29.1";
+
+  src = fetchurl {
+    url = "mirror://savannah/icoutils/${name}.tar.bz2";
+    sha256 = "180yqv41yc3fi6ggx7azhmaciqzadj0ir87wajigmcpgxkjk6v34";
+  };
+
+  buildInputs = [ libpng ];
+
+  meta = {
+    homepage = http://www.nongnu.org/icoutils/;
+    description = "Set of  programs to deal with Microsoft Windows(R) icon and cursor files";
+    license = "GPLv3+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix
new file mode 100644
index 000000000000..df1046cb750f
--- /dev/null
+++ b/pkgs/tools/graphics/pngtoico/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libpng }:
+
+stdenv.mkDerivation rec {
+  name = "pngtoico-1.0";
+
+  src = fetchurl {
+    url = mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz;
+    sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph";
+  };
+
+  configurePhase = ''
+    sed -i s,/usr/local,$out, Makefile
+  '';
+
+  buildInputs = [ libpng ];
+
+  meta = {
+    homepage = http://www.kernel.org/pub/software/graphics/pngtoico/;
+    description = "Small utility to convert a set of PNG images to Microsoft ICO format";
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}