svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=31311
2012-01-05 12:11:18 +00:00
parent bdb01cc707 e048801966
commit 6ed3147550
41 changed files with 368 additions and 148 deletions
@@ -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;
+  };
+}
@@ -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;
+  };
+}