Author: shlevy
Date: Fri Mar 30 01:36:38 2012
New Revision: 33481
URL: https://nixos.org/websvn/nix/?rev=33481&sc=1
Log:
Add libicns
Added:
nixpkgs/trunk/pkgs/development/libraries/libicns/
nixpkgs/trunk/pkgs/development/libraries/libicns/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/openjpeg/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/libicns/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libicns/default.nix Fri Mar
30 01:36:38 2012 (r33481)
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, libpng, openjpeg }:
+
+stdenv.mkDerivation {
+ name = "libicns-0.8.0";
+
+ src = fetchurl {
+ url = mirror://sourceforge/icns/libicns-0.8.0.tar.gz;
+ sha256 = "0jh67nm07jr1nfkfjid3jjw7fyw5hvj6a2fqan1bhg6gyr2hswla";
+ };
+
+ buildInputs = [ libpng openjpeg ];
+}
Modified: nixpkgs/trunk/pkgs/development/libraries/openjpeg/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/openjpeg/default.nix Thu Mar
29 22:10:24 2012 (r33480)
+++ nixpkgs/trunk/pkgs/development/libraries/openjpeg/default.nix Fri Mar
30 01:36:38 2012 (r33481)
@@ -1,21 +1,13 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "openjpeg-1.2";
+ name = "openjpeg-1.5.0";
src = fetchurl {
- url = http://www.openjpeg.org/openjpeg_v1_2.tar.gz;
- sha256 = "1i72i0hhssgg6vfkaw3gpwf5ld65g9s77ay8pxd4any1xy54qa90";
+ url = http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz;
+ sha256 = "1kja6s9dk0hh7p9064kg69y6vninwyvpqi8cap92waj38jmqz469";
};
- patchPhase = ''
- sed -i -e 's/-o root -g [^ ]\+//' Makefile Makefile.osx
- '';
-
- preInstall = ''
- export installFlags="PREFIX=$out"
- '';
-
meta = {
homepage = http://www.openjpeg.org/;
description = "Open-source JPEG 2000 codec written in C language";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Mar 29 22:10:24
2012 (r33480)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Mar 30 01:36:38
2012 (r33481)
@@ -4035,6 +4035,8 @@
libical = callPackage ../development/libraries/libical { };
+ libicns = callPackage ../development/libraries/libicns { };
+
libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
libiodbc = callPackage ../development/libraries/libiodbc {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
