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

* JasPer: build without OpenGL/X support - it's only used to build a

Browse Source 
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:
Eelco Dolstra 2009-03-20 16:27:32 +00:00
parent 3be3abe6ab
commit bec9f4b0c3
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/gtk-libs/2.14/default.nix
View File

@ -12,7 +12,6 @@ rec {
inherit glib atk pango; inherit glib atk pango;
}); });
glibmm = (import ./glibmm) (args // { inherit glib; }); glibmm = (import ./glibmm) (args // { inherit glib; });
pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; }); pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; });

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

@ -1,4 +1,5 @@
args: with args; {stdenv, fetchurl, unzip, xlibs, libjpeg}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jasper-1.900.1"; name = "jasper-1.900.1";
@ -7,9 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b";
}; };
buildInputs = [ unzip libjpeg xproto libX11 libICE freeglut mesa libXmu buildInputs = [unzip libjpeg];
libXi libXext libXt ];
configureFlags = "--enable-shared --disable-static --with-x"; configureFlags = "--enable-shared --disable-static";
meta = { meta = {
homepage = http://www.ece.uvic.ca/~mdadams/jasper/; homepage = http://www.ece.uvic.ca/~mdadams/jasper/;

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

@ -3186,8 +3186,7 @@ let
}; };
jasper = import ../development/libraries/jasper { jasper = import ../development/libraries/jasper {
inherit fetchurl stdenv unzip libjpeg freeglut mesa; inherit fetchurl stdenv unzip xlibs libjpeg;
inherit (xlibs) xproto libX11 libICE libXmu libXi libXext libXt;
}; };
lablgtk = import ../development/libraries/lablgtk { lablgtk = import ../development/libraries/lablgtk {