chromium: Drop conditionals for version 33.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
11b84078c5
commit
0517041a2f
@ -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/"
|
||||
|
||||
|
@ -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" ];
|
||||
|
Loading…
Reference in New Issue
Block a user