From 834d8be46e0469d80bd9e208793991694d4d6ec2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 4 Jul 2012 14:12:36 +0200 Subject: [PATCH] chromium: Fix build for versions older than 21.x. The current stable version won't build if gyp can't use svnversion from the subversion package, so let's provide it for versions below 21.x. --- pkgs/applications/networking/browsers/chromium/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 751aaf8ee67d..4c3a02dcecc2 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,8 @@ { stdenv, getConfig, fetchurl, makeWrapper, which +# this is needed in order to build the versions older than 21.x +, subversion + # default dependencies , bzip2, flac, speex , libevent, expat, libjpeg @@ -70,12 +73,14 @@ let use_system_v8 = false; }; + needsSubversion = stdenv.lib.versionOlder sourceInfo.version "21.0.0.0"; + defaultDependencies = [ bzip2 flac speex libevent expat libjpeg libpng libxml2 libxslt xdg_utils yasm zlib - ]; + ] ++ stdenv.lib.optional needsSubversion subversion; in stdenv.mkDerivation rec { name = "${packageName}-${version}";