diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 18:01:17 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 18:01:17 +0000 |
commit | f1598a8941287ed25deca83cc71c72c256089362 (patch) | |
tree | b4735ba022095233ef2ea865de4145faead12f2e /pkgs/development/libraries/fltk | |
parent | d67aefc19d29a1522b21152f508b90a1c0261c3d (diff) |
* More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
Diffstat (limited to 'pkgs/development/libraries/fltk')
-rw-r--r-- | pkgs/development/libraries/fltk/default.nix | 33 | ||||
-rw-r--r-- | pkgs/development/libraries/fltk/fltk11.nix | 33 |
2 files changed, 36 insertions, 30 deletions
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 1fb1cda335398..6b6cb2ba87900 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,17 +1,19 @@ -args: with args; -let inherit (args.composableDerivation) composableDerivation edf; in -composableDerivation {} rec { +{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }: +let inherit (composableDerivation) edf; in + +composableDerivation.composableDerivation {} rec { name = "fltk-2.0.x-r6970"; - src = args.fetchurl { + src = fetchurl { url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2"; sha256 = "0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3"; }; - propagatedBuildInputs=[x11 inputproto libXi freeglut]; + propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; - buildInputs = [ args.pkgconfig ]; + buildInputs = [ pkgconfig ]; flags = # this could be tidied up (?).. eg why does it require freeglut without glSupport? @@ -28,18 +30,19 @@ composableDerivation {} rec { // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } # turn on Xinerama support default=no // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } # turn on Xft support default=no // edf { name = "xdbe"; }; # turn on Xdbe support default=no + cfg = { - largefileSupport = true; # is default - glSupport = true; # doesn't build without it. Why? - localjpegSupport = false; - localzlibSupport = false; - localpngSupport = false; - sharedSupport = true; - threadsSupport = true; + largefileSupport = true; # is default + glSupport = true; # doesn't build without it. Why? + localjpegSupport = false; + localzlibSupport = false; + localpngSupport = false; + sharedSupport = true; + threadsSupport = true; }; meta = { - description = "a C++ cross platform lightweight gui library binding"; - homepage = http://www.fltk.org; + description = "a C++ cross platform lightweight gui library binding"; + homepage = http://www.fltk.org; }; } diff --git a/pkgs/development/libraries/fltk/fltk11.nix b/pkgs/development/libraries/fltk/fltk11.nix index 41733862c172d..118b24ec317fb 100644 --- a/pkgs/development/libraries/fltk/fltk11.nix +++ b/pkgs/development/libraries/fltk/fltk11.nix @@ -1,17 +1,19 @@ -args: with args; -let inherit (args.composableDerivation) composableDerivation edf; in -composableDerivation {} { +{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }: +let inherit (composableDerivation) edf; in + +composableDerivation.composableDerivation {} { name = "fltk-1.1.10"; - src = args.fetchurl { + src = fetchurl { url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2; sha256 = "16mic69a48y3ybijml754x38djxxb25rn8441p9qsssqy8ms5b9p"; }; - propagatedBuildInputs=[x11 inputproto libXi freeglut]; + propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; - buildInputs = [ args.pkgconfig ]; + buildInputs = [ pkgconfig ]; flags = # this could be tidied up (?).. eg why does it require freeglut without glSupport? @@ -28,18 +30,19 @@ composableDerivation {} { // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } # turn on Xinerama support default=no // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } # turn on Xft support default=no // edf { name = "xdbe"; }; # turn on Xdbe support default=no + cfg = { - largefileSupport = true; # is default - glSupport = true; # doesn't build without it. Why? - localjpegSupport = false; - localzlibSupport = false; - localpngSupport = false; - sharedSupport = true; - threadsSupport = true; + largefileSupport = true; # is default + glSupport = true; # doesn't build without it. Why? + localjpegSupport = false; + localzlibSupport = false; + localpngSupport = false; + sharedSupport = true; + threadsSupport = true; }; meta = { - description = "a C++ cross platform lightweight gui library binding"; - homepage = http://www.fltk.org; + description = "A C++ cross-platform light-weight GUI library binding"; + homepage = http://www.fltk.org; }; } |