summary refs log tree commit diff
path: root/pkgs/applications/office/scribus/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2012-08-07 17:41:18 +0200
committerVladimír Čunát <vcunat@gmail.com>2012-08-07 17:41:18 +0200
commitcf3ea80e1f6c2ce063f06cdc60a0daa0f91da926 (patch)
treed7909271d98fb66980194310fbb9515d96ad9eb2 /pkgs/applications/office/scribus/default.nix
parent54651b266293992b16dfc625acfeded132e9b74f (diff)
downloadnixpkgs-cf3ea80e1f6c2ce063f06cdc60a0daa0f91da926.tar
nixpkgs-cf3ea80e1f6c2ce063f06cdc60a0daa0f91da926.tar.gz
nixpkgs-cf3ea80e1f6c2ce063f06cdc60a0daa0f91da926.tar.bz2
nixpkgs-cf3ea80e1f6c2ce063f06cdc60a0daa0f91da926.tar.lz
nixpkgs-cf3ea80e1f6c2ce063f06cdc60a0daa0f91da926.tar.xz
nixpkgs-cf3ea80e1f6c2ce063f06cdc60a0daa0f91da926.tar.zst
nixpkgs-cf3ea80e1f6c2ce063f06cdc60a0daa0f91da926.zip
Scribus minor update, modifying dependencies.
- using the boostHeaders dep to build scribus with 2geom (internal)
- adding more xorg deps to build with XCB support
Diffstat (limited to 'pkgs/applications/office/scribus/default.nix')
-rw-r--r--pkgs/applications/office/scribus/default.nix21
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index 3c72db17e1f..a4f5821c54c 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
-, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
-stdenv.mkDerivation {
-  name = "scribus-1.4.0rc6";
+, libart_lgpl, qt4, python, cups, fontconfig, libjpeg
+, zlib, libpng, xorg, cairo, podofo, aspell, boostHeaders, cmake }:
+
+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
+      boostHeaders # for internal 2geom library
+      libXaw libXext libX11 libXtst libXi libXinerama
+      libpthreadstubs libXau libXdmcp
     ];
 
   meta = {