summary refs log tree commit diff
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-12-28 18:26:50 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-12-28 18:51:23 +0100
commitcb639302df235bc1a9a3f1c14901c021813ee6b5 (patch)
tree8da28d8c378ed00f783ee59c662b1bc4b1ac5fcc /pkgs/tools/text
parent2265bab69d888abc8e82d31b0ee3fdee409102ca (diff)
parent28188fca3a6f56fc2d21485f0e14934901665cba (diff)
downloadnixlib-cb639302df235bc1a9a3f1c14901c021813ee6b5.tar
nixlib-cb639302df235bc1a9a3f1c14901c021813ee6b5.tar.gz
nixlib-cb639302df235bc1a9a3f1c14901c021813ee6b5.tar.bz2
nixlib-cb639302df235bc1a9a3f1c14901c021813ee6b5.tar.lz
nixlib-cb639302df235bc1a9a3f1c14901c021813ee6b5.tar.xz
nixlib-cb639302df235bc1a9a3f1c14901c021813ee6b5.tar.zst
nixlib-cb639302df235bc1a9a3f1c14901c021813ee6b5.zip
Merge glibc-2.18 branch into stdenv-updates
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/source-highlight/default.nix18
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix
index e5928e162560..21a866cf87e8 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@@ -8,21 +8,23 @@ stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
-      url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
-      sha256 = "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1";
-    };
+    url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
+    sha256 = "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1";
+  };
 
   configureFlags = [ "--with-boost=${boost}" ];
 
-  buildInputs = [boost];
+  buildInputs = [ boost ];
+
+  enableParallelBuilding = false;
+
   doCheck = true;
 
   meta = {
-    description = "source code renderer with syntax highlighting";
-    homepage = "http://www.gnu.org/software/src-highlite/";
+    description = "Source code renderer with syntax highlighting";
+    homepage = http://www.gnu.org/software/src-highlite/;
     license = "GPLv3+";
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     longDescription =
       ''
         GNU Source-highlight, given a source file, produces a document