[Nix-dev] Scribus update and boost dep

[Vladimír Čunát]

Hi.
While updating Scribus I noticed that it's complaining about missing 
boost and therefore omitting some shape-editing features (IMO).

If noone objects, I will apply the attached patch in a few days. I 
understand some might mind the boost dependency so I'm open for discussion.

Vlada
-------------- next part --------------
commit 9b1eb47711e41caaf1b24ccda925bee4df439c86
Author: Vladimír Čunát <vcunat at gmail.com>
Date:   Tue Aug 7 11:19:11 2012 +0200

    Scribus minor update, modifying dependencies.
    
    - using the boost dep to build scribus with 2geom (internal)
    - adding more xorg deps to build with XCB support

diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index 3c72db1..9504d8d 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,21 +1,24 @@
 { 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 }:
-stdenv.mkDerivation {
-  name = "scribus-1.4.0rc6";
+
+stdenv.mkDerivation rec {
+  name = "scribus-1.4.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/scribus/scribus/scribus-1.4.0.rc6.tar.bz2;
-    sha256 = "1rrnzxjzhqj4lgyfswly501xlyvm4hsnnq7zw008v0cnkx31icli";
+    url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz";
+    sha256 = "1n67z2bk5ca2sxvv43jvj7yygfr4d2x5yc69zk70v38prm0gqlv8";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs =
-    [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt
+  buildInputs = with xorg;
+    [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
       python cups fontconfig
-      xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama
       libjpeg zlib libpng podofo aspell cairo
+      boost # for internal 2geom library
+      libXaw libXext libX11 libXtst libXi libXinerama
+      libpthreadstubs libXau libXdmcp
     ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0cf5f4..14c691c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7477,7 +7477,6 @@ let
 
   scribus = callPackage ../applications/office/scribus {
     inherit (gnome) libart_lgpl;
-    qt = qt4;
   };
 
   seeks = callPackage ../tools/networking/p2p/seeks {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3238 bytes
Desc: S/MIME Cryptographic Signature
Url : http://lists.science.uu.nl/pipermail/nix-dev/attachments/20120807/afd6e369/attachment-0001.bin