diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-20 10:33:38 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-20 10:33:38 +0000 |
commit | 24661f4c45c2551bd0102ec1218742fa0cdb8ef2 (patch) | |
tree | 464ba5cdc260e997b9a95f21dacb9f8855820726 /pkgs/applications/office/scribus | |
parent | 3d1c24c00443e27507a2c41ce8cbf06938ef8845 (diff) | |
download | nixpkgs-24661f4c45c2551bd0102ec1218742fa0cdb8ef2.tar nixpkgs-24661f4c45c2551bd0102ec1218742fa0cdb8ef2.tar.gz nixpkgs-24661f4c45c2551bd0102ec1218742fa0cdb8ef2.tar.bz2 nixpkgs-24661f4c45c2551bd0102ec1218742fa0cdb8ef2.tar.lz nixpkgs-24661f4c45c2551bd0102ec1218742fa0cdb8ef2.tar.xz nixpkgs-24661f4c45c2551bd0102ec1218742fa0cdb8ef2.tar.zst nixpkgs-24661f4c45c2551bd0102ec1218742fa0cdb8ef2.zip |
svn path=/nixpkgs/trunk/; revision=17892
Diffstat (limited to 'pkgs/applications/office/scribus')
-rw-r--r-- | pkgs/applications/office/scribus/default.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 768e3edddcd..213d3b7ab9b 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,6 +1,6 @@ args: with args; -assert stdenv.gcc ? gcc; +assert stdenv.gcc.gcc != null; # NOTE: ! If Scribus doesn't render text try another font. @@ -31,11 +31,12 @@ stdenv.mkDerivation { set +x ''; - 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 - ] ++ (if useCairo then [cairo] else []); + 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; # fix rpath which is removed by cmake.. postFixup = '' @@ -47,11 +48,11 @@ stdenv.mkDerivation { ''; meta = { - maintainers = [lib.maintainers.marcweber]; - platforms = lib.platforms.linux; - description = "Desktop Publishing (DTP) and Layout program for Linux."; - homepage = http://www.scribus.net; - license = "GPLv2"; - }; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; + description = "Desktop Publishing (DTP) and Layout program for Linux."; + homepage = http://www.scribus.net; + license = "GPLv2"; + }; } |