public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating scribus to 1.4.0rc6. The developers say they abandoned 1.3 long ago.

Browse Source 
svn path=/nixpkgs/trunk/; revision=30190
This commit is contained in:
Lluís Batlle i Rossell 2011-11-02 15:00:11 +00:00
parent 665dc49d43
commit b931fd862d
2 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/applications/office/scribus/default.nix
View File

@ -1,50 +1,22 @@
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
, libart_lgpl, qt, python, cups, fontconfig, libjpeg , libart_lgpl, qt, python, cups, fontconfig, libjpeg
, zlib, libpng, xorg, cairo, cmake }: , zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
assert stdenv.gcc.gcc != null;
# NOTE: ! If Scribus doesn't render text try another font.
# a lot of templates, colour palettes, colour profiles or gradients
# will be released with the next version of scribus - So don't miss them
# when upgrading this package
let useCairo = false; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "scribus-1.3.3.14"; name = "scribus-1.4.0rc6";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/scribus/scribus/1.3.3.14/scribus-1.3.3.14.tar.bz2; url = mirror://sourceforge/scribus/scribus/scribus-1.4.0.rc6.tar.bz2;
sha256 = "1ig7x6vxhqgjlpnv6hkzpb6gj4yvxsrx7rw900zlp7g6zxl01iyy"; sha256 = "1rrnzxjzhqj4lgyfswly501xlyvm4hsnnq7zw008v0cnkx31icli";
}; };
cmakeFlags = if useCairo then "-DWANT_CAIRO=1" else ""; enableParallelBuilding = true;
configurePhase = ''
set -x
mkdir -p build;
cd build
eval -- "cmake .. $cmakeFlags"
set +x
'';
buildInputs = buildInputs =
[ pkgconfig /*<- required fro cairo only?*/ cmake freetype lcms libtiff libxml2 libart_lgpl qt [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt
python cups fontconfig python cups fontconfig
xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama
libjpeg zlib libpng libjpeg zlib libpng podofo aspell cairo
] ++ stdenv.lib.optional useCairo cairo; ];
# fix rpath which is removed by cmake..
postFixup = ''
for i in $buildNativeInputs ${stdenv.gcc.gcc}; do
[ -d "$i/lib" ] && RPATH="$RPATH:$i/lib"
[ -d "$i/lib64" ] && RPATH="$RPATH:$i/lib64"
done
patchelf --set-rpath "''\${RPATH:1}" $out/bin/scribus
'';
meta = { meta = {
maintainers = [ stdenv.lib.maintainers.marcweber ]; maintainers = [ stdenv.lib.maintainers.marcweber ];
@ -54,4 +26,3 @@ stdenv.mkDerivation {
license = "GPLv2"; license = "GPLv2";
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -7255,7 +7255,7 @@ let
scribus = callPackage ../applications/office/scribus { scribus = callPackage ../applications/office/scribus {
inherit (gnome) libart_lgpl; inherit (gnome) libart_lgpl;
qt = qt3; qt = qt4;
}; };
seeks = callPackage ../tools/networking/p2p/seeks { }; seeks = callPackage ../tools/networking/p2p/seeks { };