From cce984b32464d3a579ac690c6bddb8541f0623c9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 23 Mar 2014 16:29:07 +0100 Subject: [PATCH] chromium: Correct tools path in blink_idl_parser. This is because of our symlink mess, as Chromium's build support scripts are trying to resolve everything based on absolute paths and we split off the bundled sources from the main derivation. Yes, I'm refering to this as a mess, because in the end, we're going to patch up the gyp files and use references someday. Signed-off-by: aszlig --- .../applications/networking/browsers/chromium/browser.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 66e2522bf13..321c03a3ede 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -222,6 +222,14 @@ in stdenv.mkDerivation rec { s|$|if parts[0].startswith("../") else parts[0]|; }' third_party/WebKit/Source/build/scripts/in_file.py \ third_party/WebKit/Source/build/scripts/make_event_factory.py + '' + optionalString (!versionOlder source.version "35.0.0.0") '' + # Transform symlinks into plain files + sed -i -e "" third_party/jinja2/__init__.py \ + third_party/jinja2/environment.py \ + third_party/WebKit/Source/bindings/scripts/idl_compiler.py + + sed -i -e '/tools_dir *=/s|=.*|= "'"$(pwd)"'/tools"|' \ + third_party/WebKit/Source/bindings/scripts/blink_idl_parser.py ''; postPatch = ''