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

Scribus minor update, modifying dependencies.

Browse Source 
- using the boostHeaders dep to build scribus with 2geom (internal)
- adding more xorg deps to build with XCB support
This commit is contained in:
Vladimír Čunát 2012-08-07 17:41:18 +02:00
parent 54651b2662
commit cf3ea80e1f
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,24 @@
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
, libart_lgpl, qt, python, cups, fontconfig, libjpeg , libart_lgpl, qt4, python, cups, fontconfig, libjpeg
, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }: , zlib, libpng, xorg, cairo, podofo, aspell, boostHeaders, cmake }:
stdenv.mkDerivation {
name = "scribus-1.4.0rc6"; stdenv.mkDerivation rec {
name = "scribus-1.4.1";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/scribus/scribus/scribus-1.4.0.rc6.tar.bz2; url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz";
sha256 = "1rrnzxjzhqj4lgyfswly501xlyvm4hsnnq7zw008v0cnkx31icli"; sha256 = "1n67z2bk5ca2sxvv43jvj7yygfr4d2x5yc69zk70v38prm0gqlv8";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = buildInputs = with xorg;
[ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
python cups fontconfig python cups fontconfig
xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama
libjpeg zlib libpng podofo aspell cairo libjpeg zlib libpng podofo aspell cairo
boostHeaders # for internal 2geom library
libXaw libXext libX11 libXtst libXi libXinerama
libpthreadstubs libXau libXdmcp
]; ];
meta = { meta = {

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

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