diff --git a/pkgs/TODO b/pkgs/TODO index 3fac0a249d7..0ce1ade864e 100644 --- a/pkgs/TODO +++ b/pkgs/TODO @@ -5,3 +5,6 @@ * Patch development/tools/misc/libtool not to search standard directories for libraries (like setup.sh does now). [do we want this?] + + +* Inform freedesktop people that Xaw requires Xpm. \ No newline at end of file diff --git a/pkgs/development/libraries/freedesktop/libXaw/default.nix b/pkgs/development/libraries/freedesktop/libXaw/default.nix new file mode 100644 index 00000000000..b4649a9e828 --- /dev/null +++ b/pkgs/development/libraries/freedesktop/libXaw/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt, libXmu, libXpm}: + +stdenv.mkDerivation { + name = "libXaw-7.0.0"; + src = fetchurl { + url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXaw-7.0.0.tar.bz2; + md5 = "a58fbb1b5af9e0cf23351b5b1e7b19dd"; + }; + buildInputs = [pkgconfig]; + propagatedBuildInputs = [xproto libX11 libXt libXmu libXpm]; +} diff --git a/pkgs/development/libraries/freedesktop/libXmu/default.nix b/pkgs/development/libraries/freedesktop/libXmu/default.nix new file mode 100644 index 00000000000..963fa0e858d --- /dev/null +++ b/pkgs/development/libraries/freedesktop/libXmu/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt}: + +stdenv.mkDerivation { + name = "libXmu-6.2.1"; + src = fetchurl { + url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXmu-6.2.1.tar.bz2; + md5 = "9bbdfe7eac185872cd1718d3f2014cf1"; + }; + buildInputs = [pkgconfig]; + propagatedBuildInputs = [xproto libX11 libXt]; +} diff --git a/pkgs/development/libraries/freedesktop/libXpm/default.nix b/pkgs/development/libraries/freedesktop/libXpm/default.nix new file mode 100644 index 00000000000..ba17158ab4a --- /dev/null +++ b/pkgs/development/libraries/freedesktop/libXpm/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, xproto, libX11}: + +stdenv.mkDerivation { + name = "libXpm-3.5.0"; + src = fetchurl { + url = http://losser.st-lab.cs.uu.nl/~eelco/dist/libXpm-3.5.0-cvs.tar.bz2; + md5 = "4695fdbc251e0b6dd1b984c51b85c781"; + }; + buildInputs = [pkgconfig]; + propagatedBuildInputs = [xproto libX11]; +} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 88e2d3824fc..34eee1d7cf7 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -109,7 +109,7 @@ rec { }; graphviz = (import ../tools/graphics/graphviz) { - inherit fetchurl stdenv libpng libjpeg expat x11; + inherit fetchurl stdenv libpng libjpeg expat x11 libXaw; }; @@ -577,7 +577,6 @@ rec { libXt = (import ../development/libraries/freedesktop/libXt) { inherit fetchurl stdenv pkgconfig libX11 libSM; - patch = gnupatch; }; renderext = (import ../development/libraries/freedesktop/renderext) { @@ -600,8 +599,16 @@ rec { inherit fetchurl stdenv pkgconfig xproto libX11 libXt; }; + libXpm = (import ../development/libraries/freedesktop/libXpm) { + inherit fetchurl stdenv pkgconfig xproto libX11; + }; + + libXpmdist = (import ../development/libraries/freedesktop/libXpm/make-dist.nix) { + inherit stdenv pkgconfig autoconf automake libtool xproto libX11; + }; + libXaw = (import ../development/libraries/freedesktop/libXaw) { - inherit fetchurl stdenv pkgconfig xproto libX11 libXt; + inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXmu libXpm; }; xlibs = (import ../development/libraries/freedesktop/xlibs) { diff --git a/pkgs/tools/graphics/graphviz/builder.sh b/pkgs/tools/graphics/graphviz/builder.sh deleted file mode 100644 index 1926fc3c9d1..00000000000 --- a/pkgs/tools/graphics/graphviz/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -buildinputs="$x11 $libpng $libjpeg $expat $freetype" -. $stdenv/setup - -if test -z "$x11"; then - configureFlags="$configureFlags --without-x" -fi - -genericBuild diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index c9303bc72a8..1bd47bd7b59 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, x11, libpng, libjpeg, expat}: +{stdenv, fetchurl, x11, libpng, libjpeg, expat, libXaw}: -assert x11 != null && libpng != null && libjpeg != null - && expat != null; +assert libpng != null && libjpeg != null && expat != null; stdenv.mkDerivation { name = "graphviz-1.10"; - builder = ./builder.sh; src = fetchurl { url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz; md5 = "e1402531abff68d146bf94e72b44dc2a"; +# url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz; +# md5 = "84910caae072c714d107ca9f3e54ace0"; }; - x11 = x11; - libpng = libpng; - libjpeg = libjpeg; - expat = expat; + buildInputs = [x11 libpng libjpeg expat libXaw]; + configureFlags = [ + (if x11 == null then "--without-x" else "") + ]; }