public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chromium: Drop conditionals for version 33. 

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-04-19 15:31:38 +02:00
parent 11b84078c5
commit 0517041a2f
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@ -9,9 +9,7 @@ mkChromiumDerivation (base: rec {
installPhase = '' installPhase = ''
ensureDir "$libExecPath" ensureDir "$libExecPath"
cp -v "$buildPath/"*.pak "$libExecPath/" cp -v "$buildPath/"*.pak "$libExecPath/"
${optionalString (!versionOlder base.version "34.0.0.0") ''
cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/"
''}
cp -vR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -vR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
cp -v $buildPath/libffmpegsumo.so "$libExecPath/" cp -v $buildPath/libffmpegsumo.so "$libExecPath/"

3
pkgs/applications/networking/browsers/chromium/source/default.nix
View File

@ -32,14 +32,13 @@ stdenv.mkDerivation {
-e 's|/bin/echo|echo|' \ -e 's|/bin/echo|echo|' \
-e "/python_arch/s/: *'[^']*'/: '""'/" \ -e "/python_arch/s/: *'[^']*'/: '""'/" \
build/common.gypi chrome/chrome_tests.gypi 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|' \ sed -i -e 's|/usr/bin/gcc|gcc|' \
third_party/WebKit/Source/build/scripts/scripts.gypi \ third_party/WebKit/Source/build/scripts/scripts.gypi \
third_party/WebKit/Source/build/scripts/preprocessor.pm third_party/WebKit/Source/build/scripts/preprocessor.pm
'' + optionalString useOpenSSL '' '' + optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
'' + optionalString (!versionOlder version "34.0.0.0") '' '' + optionalString (!versionOlder version "34.0.0.0") ''
sed -i '/import.*depot/d' build/gyp_chromium
''; '';
outputs = [ "out" "sandbox" "bundled" "main" ]; outputs = [ "out" "sandbox" "bundled" "main" ];