From 3691639db179ceeb3e2bd1aa28c3edaaaaf0233e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Dec 2006 01:17:21 +0000 Subject: [PATCH] * By popular demand: xfig. svn path=/nixpkgs/trunk/; revision=7278 --- pkgs/applications/graphics/xfig/builder.sh | 26 ++++++++++++++++ pkgs/applications/graphics/xfig/default.nix | 23 ++++++++++++++ pkgs/tools/graphics/transfig/builder.sh | 34 ++++++++++----------- pkgs/top-level/all-packages.nix | 6 ++++ pkgs/top-level/build-for-release.nix | 1 + 5 files changed, 72 insertions(+), 18 deletions(-) create mode 100644 pkgs/applications/graphics/xfig/builder.sh create mode 100644 pkgs/applications/graphics/xfig/default.nix diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh new file mode 100644 index 000000000000..f4c77ff8ad21 --- /dev/null +++ b/pkgs/applications/graphics/xfig/builder.sh @@ -0,0 +1,26 @@ +source $stdenv/setup +source $makeWrapper + +makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man" + +preBuild=preBuild +preBuild() { + echo "#define XAW3D" >> Imakefile.tmp + echo "#define XAW3D1_5E" >> Imakefile.tmp + cat Imakefile >> Imakefile.tmp + mv Imakefile.tmp Imakefile + xmkmf +} + +dontMakeInstall=1 +preInstall=preInstall +preInstall() { + make install.all $makeFlags + + mv $out/bin/xfig $out/bin/.xfig + + makeWrapper $out/bin/.xfig $out/bin/xfig \ + --set XAPPLRESDIR $out/etc/X11/app-defaults +} + +genericBuild diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix new file mode 100644 index 000000000000..0d94d4a655d0 --- /dev/null +++ b/pkgs/applications/graphics/xfig/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, makeWrapper, imake +, x11, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}: + +stdenv.mkDerivation { + name = "xfig-3.2.5-pre-alpha-5"; + + src = fetchurl { + url = http://xfig.org/software/xfig/3.2.5-alpha/xfig.3.2.5-alpha5.full.tar.gz; + md5 = "7547b66232569e3c12e4a0639bd92629"; + }; + + builder = ./builder.sh; + + buildInputs = [imake x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; + + inherit makeWrapper; + + NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11"; + + meta = { + description = "An interactive drawing tool for X11"; + }; +} diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh index d3bd374cda22..8a91d78a089b 100644 --- a/pkgs/tools/graphics/transfig/builder.sh +++ b/pkgs/tools/graphics/transfig/builder.sh @@ -2,27 +2,27 @@ source $stdenv/setup patchPhase=patchPhase patchPhase() { - for i in $patches; do - header "applying patch $i" 3 - patch -p0 < $i || fail - stopNest - done + for i in $patches; do + header "applying patch $i" 3 + patch -p0 < $i || fail + stopNest + done - configureImakefiles "s:__PREFIX_PNG:$libpng:" - configureImakefiles "s:__PREFIX:$out:" + configureImakefiles "s:__PREFIX_PNG:$libpng:" + configureImakefiles "s:__PREFIX:$out:" } configureImakefiles() { - local sedcmd=$1 + local sedcmd=$1 - sed "${sedcmd}" fig2dev/Imakefile > tmpsed - cp tmpsed fig2dev/Imakefile + sed "${sedcmd}" fig2dev/Imakefile > tmpsed + cp tmpsed fig2dev/Imakefile - sed "${sedcmd}" fig2dev/dev/Imakefile > tmpsed - cp tmpsed fig2dev/dev/Imakefile + sed "${sedcmd}" fig2dev/dev/Imakefile > tmpsed + cp tmpsed fig2dev/dev/Imakefile - sed "${sedcmd}" transfig/Imakefile > tmpsed - cp tmpsed transfig/Imakefile + sed "${sedcmd}" transfig/Imakefile > tmpsed + cp tmpsed transfig/Imakefile } buildPhase=buildPhase @@ -34,10 +34,8 @@ buildPhase() { preInstall=preInstall preInstall() { - ensureDir $out - ensureDir $out/lib + ensureDir $out + ensureDir $out/lib } genericBuild - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70e81f40efea..14bf9a095366 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2708,6 +2708,12 @@ rec { inherit fetchurl stdenv wxGTK chmlib; }; + xfig = import ../applications/graphics/xfig { + stdenv = overrideGCC (overrideSetup stdenv ../stdenv/generic/setup-new.sh) gcc34; + inherit fetchurl makeWrapper x11 Xaw3d libpng libjpeg; + inherit (xlibs) imake libXpm libXmu libXi libXp; + }; + xineUI = import ../applications/video/xine-ui { inherit fetchurl stdenv x11 xineLib libpng; }; diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 354e224c534a..e963da80f161 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -131,6 +131,7 @@ let { vlc wget xchm + xfig xineUI xmltv xmms