diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-04-24 17:39:36 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-03 16:15:20 +0200 |
| commit | a6fdcea877889ff56f533e7bda7c0c57e56f0b72 (patch) | |
| tree | 61a5e777695412766dd0bc8a71de6713743d5442 | |
| parent | b9fc31a4152a0e89c57231220c8e853606d5a5ce (diff) | |
| download | nixpkgs-a6fdcea877889ff56f533e7bda7c0c57e56f0b72.tar nixpkgs-a6fdcea877889ff56f533e7bda7c0c57e56f0b72.tar.gz nixpkgs-a6fdcea877889ff56f533e7bda7c0c57e56f0b72.tar.bz2 nixpkgs-a6fdcea877889ff56f533e7bda7c0c57e56f0b72.tar.lz nixpkgs-a6fdcea877889ff56f533e7bda7c0c57e56f0b72.tar.xz nixpkgs-a6fdcea877889ff56f533e7bda7c0c57e56f0b72.tar.zst nixpkgs-a6fdcea877889ff56f533e7bda7c0c57e56f0b72.zip | |
cimg: 1.5.9 -> 1.7.0
| -rw-r--r-- | pkgs/development/libraries/cimg/builder.sh | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/cimg/default.nix | 15 |
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/libraries/cimg/builder.sh b/pkgs/development/libraries/cimg/builder.sh index bbd5f712551..6473395493c 100644 --- a/pkgs/development/libraries/cimg/builder.sh +++ b/pkgs/development/libraries/cimg/builder.sh @@ -4,9 +4,8 @@ source $stdenv/setup unpackPhase cd $sourceRoot -install -dm 755 $out/include/cimg $out/share/doc/cimg/html $out/share/cimg/examples $out/share/cimg/plugins +install -dm 755 $out/include/cimg $doc/share/doc/cimg/html $doc/share/cimg/examples $doc/share/cimg/plugins install -m 644 CImg.h $out/include/cimg -cp -dr --no-preserve=ownership html/* $out/share/doc/cimg/html/ -cp -dr --no-preserve=ownership examples/* $out/share/cimg/examples/ -cp -dr --no-preserve=ownership plugins/* $out/share/cimg/plugins/ +cp -dr --no-preserve=ownership examples/* $doc/share/cimg/examples/ +cp -dr --no-preserve=ownership plugins/* $doc/share/cimg/plugins/ diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index dc397adf491..722852f1270 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -4,21 +4,22 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "1.5.9"; + version = "1.7.0"; src = fetchurl { - url = "mirror://sourceforge/project/cimg/CImg-${version}.zip"; - sha256 = "1xn20643gcbl76kvy9ajhwbyjjb73mg65q32ma8mdkwn1qhn7f7c"; + url = "http://cimg.eu/files/CImg_${version}.zip"; + sha256 = "06j3n7gvgxzvprqwf56nnca195y38dcbdlszrxyn5p9w9al437zj"; }; - buildInputs = with stdenv.lib; - [ unzip ]; + buildInputs = [ unzip ]; builder = ./builder.sh; - + + outputs = [ "out" "doc" ]; + meta = with stdenv.lib; { description = "A small, open source, C++ toolkit for image processing"; - homepage = http://cimg.sourceforge.net/; + homepage = http://cimg.eu/; license = licenses.cecill-c; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; |