public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libjpeg, jasper: Split into multiple outputs

Browse Source
This commit is contained in:
Eelco Dolstra 2013-06-11 13:41:33 +02:00
parent 1a0e87b19f
commit cb3fc2c902
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/jasper/default.nix
View File

@ -12,7 +12,11 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libjpeg ]; propagatedBuildInputs = [ libjpeg ];
configureFlags = "--enable-shared"; configureFlags = "--enable-shared";
outputs = [ "dev" "out" "man" "bin" ];
enableParallelBuilding = true;
meta = { meta = {
homepage = http://www.ece.uvic.ca/~mdadams/jasper/; homepage = http://www.ece.uvic.ca/~mdadams/jasper/;
description = "JasPer JPEG2000 Library"; description = "JasPer JPEG2000 Library";

8
pkgs/development/libraries/libjpeg/default.nix
View File

@ -1,13 +1,15 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libjpeg-8d"; name = "libjpeg-8d";
src = fetchurl { src = fetchurl {
url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz; url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz;
sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0";
}; };
outputs = [ "dev" "out" "man" "bin" ];
meta = { meta = {
homepage = http://www.ijg.org/; homepage = http://www.ijg.org/;
description = "A library that implements the JPEG image file format"; description = "A library that implements the JPEG image file format";

8
pkgs/top-level/all-packages.nix
View File

@ -4217,7 +4217,9 @@ let
inherit mesa SDL SDL_image SDL_mixer; inherit mesa SDL SDL_image SDL_mixer;
}; };
jasper = callPackage ../development/libraries/jasper { }; jasper = callPackage ../development/libraries/jasper {
stdenv = stdenvMulti;
};
jama = callPackage ../development/libraries/jama { }; jama = callPackage ../development/libraries/jama { };
@ -4513,7 +4515,9 @@ let
libiptcdata = callPackage ../development/libraries/libiptcdata { }; libiptcdata = callPackage ../development/libraries/libiptcdata { };
libjpeg = callPackage ../development/libraries/libjpeg { }; libjpeg = callPackage ../development/libraries/libjpeg {
stdenv = stdenvMulti;
};
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };