diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-05-01 14:53:08 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-05-01 14:53:08 +0000 |
| commit | d56e3d6f5a5845b2101525bf6a5bee350d095e36 (patch) | |
| tree | 1d355d610c927f031aaef08fcbb89de723f98399 /pkgs/applications/misc | |
| parent | 965fa2208e5883e756c6f6dd77e61ac129480f95 (diff) | |
| download | nixlib-d56e3d6f5a5845b2101525bf6a5bee350d095e36.tar nixlib-d56e3d6f5a5845b2101525bf6a5bee350d095e36.tar.gz nixlib-d56e3d6f5a5845b2101525bf6a5bee350d095e36.tar.bz2 nixlib-d56e3d6f5a5845b2101525bf6a5bee350d095e36.tar.lz nixlib-d56e3d6f5a5845b2101525bf6a5bee350d095e36.tar.xz nixlib-d56e3d6f5a5845b2101525bf6a5bee350d095e36.tar.zst nixlib-d56e3d6f5a5845b2101525bf6a5bee350d095e36.zip | |
* Use string interpolation.
svn path=/nixpkgs/trunk/; revision=5243
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/xpdf/builder.sh | 10 | ||||
| -rw-r--r-- | pkgs/applications/misc/xpdf/default.nix | 10 |
2 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/applications/misc/xpdf/builder.sh b/pkgs/applications/misc/xpdf/builder.sh deleted file mode 100644 index a7fd6a6a51ea..000000000000 --- a/pkgs/applications/misc/xpdf/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index d7a5cc1b8306..718e089abcc7 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -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 []); + } |