swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Use string interpolation.

Browse source 
svn path=/nixpkgs/trunk/; revision=5243
This commit is contained in:
Eelco Dolstra 2006-05-01 14:53:08 +00:00
parent 965fa2208e
commit d56e3d6f5a
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/misc/xpdf/builder.sh
View file

@ -1,10 +0,0 @@
source $stdenv/setup
if test -n "$freetype"; then
configureFlags="\
--with-freetype2-library=$freetype/lib \
--with-freetype2-includes=$freetype/include/freetype2 \
$configureFlags"
fi
genericBuild

10
pkgs/applications/misc/xpdf/default.nix
View file

@ -8,7 +8,6 @@ assert useT1Lib -> t1lib != null;
stdenv.mkDerivation {
name = "xpdf-3.01";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/xpdf-3.01.tar.gz;
@ -18,7 +17,12 @@ stdenv.mkDerivation {
buildInputs =
(if enableGUI then [x11 motif] else []) ++
(if useT1Lib then [t1lib] else []);
freetype = if enableGUI || enablePDFtoPPM then freetype else null;
configureFlags = "--enable-a4-paper"; /* We obey ISO standards! */
configureFlags =
[ "--enable-a4-paper" ] /* We obey ISO standards! */
++ (if enablePDFtoPPM then [
("--with-freetype2-library=${freetype}/lib")
("--with-freetype2-includes=${freetype}/include/freetype2")
] else []);
}