diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-20 16:27:32 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-20 16:27:32 +0000 |
| commit | bec9f4b0c37fa187d7e14723811a51e2c212b97a (patch) | |
| tree | 4b534474faf6c92aaa1f71334d606927b0e9fb36 /pkgs | |
| parent | 3be3abe6ab5e33ce3ae40d37d41735288c5dda64 (diff) | |
* 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
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gtk-libs/2.14/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/jasper/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 15 insertions, 16 deletions
diff --git a/pkgs/development/libraries/gtk-libs/2.14/default.nix b/pkgs/development/libraries/gtk-libs/2.14/default.nix index a5ac93d068d17..89abc0e62086b 100644 --- a/pkgs/development/libraries/gtk-libs/2.14/default.nix +++ b/pkgs/development/libraries/gtk-libs/2.14/default.nix @@ -12,7 +12,6 @@ rec { inherit glib atk pango; }); - glibmm = (import ./glibmm) (args // { inherit glib; }); pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; }); diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 192e22add6ef5..cf91952534c46 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,18 +1,19 @@ -args: with args; +{stdenv, fetchurl, unzip, xlibs, libjpeg}: + stdenv.mkDerivation rec { - name = "jasper-1.900.1"; + name = "jasper-1.900.1"; - src = fetchurl { - url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.zip"; - sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; - }; + src = fetchurl { + url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.zip"; + 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/; - description = "JasPer JPEG2000 Library"; - }; + meta = { + homepage = http://www.ece.uvic.ca/~mdadams/jasper/; + description = "JasPer JPEG2000 Library"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a53cbdc01e0e3..dd2bc0f5ce58e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |