diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-04-19 15:31:38 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-04-20 17:45:25 +0200 |
| commit | 0517041a2fc421f3efa75933e8258ae001ce21ab (patch) | |
| tree | 5cfe23fc6cf598d98a9468e55e04bcbcfe8a4596 /pkgs | |
| parent | 11b84078c5e1cc3d3ac38122212e263760d7019d (diff) | |
| download | nixlib-0517041a2fc421f3efa75933e8258ae001ce21ab.tar nixlib-0517041a2fc421f3efa75933e8258ae001ce21ab.tar.gz nixlib-0517041a2fc421f3efa75933e8258ae001ce21ab.tar.bz2 nixlib-0517041a2fc421f3efa75933e8258ae001ce21ab.tar.lz nixlib-0517041a2fc421f3efa75933e8258ae001ce21ab.tar.xz nixlib-0517041a2fc421f3efa75933e8258ae001ce21ab.tar.zst nixlib-0517041a2fc421f3efa75933e8258ae001ce21ab.zip | |
chromium: Drop conditionals for version 33.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/source/default.nix | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 8c83dbb853a6..e230af175300 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 4ec853bddf8d..2c7e7277b814 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" ]; |