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/applications/office/scribus | |
parent | d67aefc19d29a1522b21152f508b90a1c0261c3d (diff) |
* More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
Diffstat (limited to 'pkgs/applications/office/scribus')
-rw-r--r-- | pkgs/applications/office/scribus/default.nix | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 93f8fd79fb1e4..8123f8717a8e2 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,4 +1,6 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 +, libart_lgpl, qt, python, cups, fontconfig, libjpeg +, zlib, libpng, xorg, cairo, cmake }: assert stdenv.gcc.gcc != null; @@ -8,13 +10,9 @@ assert stdenv.gcc.gcc != null; # will be released with the next version of scribus - So don't miss them # when upgrading this package -#let useCairo = true; -let useCairo = false; - -in +let useCairo = false; in stdenv.mkDerivation { - name = "scribus-1.3.3.14"; src = fetchurl { @@ -35,9 +33,9 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig /*<- required fro cairo only?*/ cmake freetype lcms libtiff libxml2 libart_lgpl qt python cups fontconfig - libXaw libXext libX11 libXtst libXi libXinerama - libjpeg libtiff zlib libpng - ] ++ lib.optional useCairo cairo; + xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama + libjpeg zlib libpng + ] ++ stdenv.lib.optional useCairo cairo; # fix rpath which is removed by cmake.. postFixup = '' @@ -49,9 +47,9 @@ stdenv.mkDerivation { ''; meta = { - maintainers = [lib.maintainers.marcweber]; - platforms = lib.platforms.linux; - description = "Desktop Publishing (DTP) and Layout program for Linux."; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; + description = "Desktop Publishing (DTP) and Layout program for Linux"; homepage = http://www.scribus.net; license = "GPLv2"; }; |