forked from mirrors/nixpkgs
* JasPer: build without OpenGL/X support - it's only used to build a
trivial example program (a barebones image viewer), but it gives everybody else a dependency on Mesa ;-) svn path=/nixpkgs/trunk/; revision=14633
This commit is contained in:
parent
3be3abe6ab
commit
bec9f4b0c3
|
@ -12,7 +12,6 @@ rec {
|
|||
inherit glib atk pango;
|
||||
});
|
||||
|
||||
|
||||
glibmm = (import ./glibmm) (args // { inherit glib; });
|
||||
|
||||
pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; });
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
args: with args;
|
||||
{stdenv, fetchurl, unzip, xlibs, libjpeg}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jasper-1.900.1";
|
||||
|
||||
|
@ -7,9 +8,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip libjpeg xproto libX11 libICE freeglut mesa libXmu
|
||||
libXi libXext libXt ];
|
||||
configureFlags = "--enable-shared --disable-static --with-x";
|
||||
buildInputs = [unzip libjpeg];
|
||||
|
||||
configureFlags = "--enable-shared --disable-static";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.ece.uvic.ca/~mdadams/jasper/;
|
||||
|
|
|
@ -3186,8 +3186,7 @@ let
|
|||
};
|
||||
|
||||
jasper = import ../development/libraries/jasper {
|
||||
inherit fetchurl stdenv unzip libjpeg freeglut mesa;
|
||||
inherit (xlibs) xproto libX11 libICE libXmu libXi libXext libXt;
|
||||
inherit fetchurl stdenv unzip xlibs libjpeg;
|
||||
};
|
||||
|
||||
lablgtk = import ../development/libraries/lablgtk {
|
||||
|
|
Loading…
Reference in a new issue