From 0517041a2fc421f3efa75933e8258ae001ce21ab Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 19 Apr 2014 15:31:38 +0200 Subject: [PATCH] chromium: Drop conditionals for version 33. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 -- .../networking/browsers/chromium/source/default.nix | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 8c83dbb853a..e230af17530 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -9,9 +9,7 @@ mkChromiumDerivation (base: rec { installPhase = '' ensureDir "$libExecPath" cp -v "$buildPath/"*.pak "$libExecPath/" - ${optionalString (!versionOlder base.version "34.0.0.0") '' cp -v "$buildPath/icudtl.dat" "$libExecPath/" - ''} cp -vR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v $buildPath/libffmpegsumo.so "$libExecPath/" diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 4ec853bddf8..2c7e7277b81 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -32,14 +32,13 @@ stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ build/common.gypi chrome/chrome_tests.gypi - sed -i '/not RunGN/,+1d' build/gyp_chromium + sed -i -e '/not RunGN/,+1d' -e '/import.*depot/d' build/gyp_chromium sed -i -e 's|/usr/bin/gcc|gcc|' \ third_party/WebKit/Source/build/scripts/scripts.gypi \ third_party/WebKit/Source/build/scripts/preprocessor.pm '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl '' + optionalString (!versionOlder version "34.0.0.0") '' - sed -i '/import.*depot/d' build/gyp_chromium ''; outputs = [ "out" "sandbox" "bundled" "main" ];