diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-06-19 19:35:30 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-06-23 03:35:30 +0200 |
| commit | 7143f34970dbf642c103f76c6387e6c6301d27b5 (patch) | |
| tree | 67932ea38646e315acecf883250b22c0e8e74c04 /pkgs/applications | |
| parent | cadd675e7ae4dc1572b0536b8f036b0901dfacde (diff) | |
| download | nixlib-7143f34970dbf642c103f76c6387e6c6301d27b5.tar nixlib-7143f34970dbf642c103f76c6387e6c6301d27b5.tar.gz nixlib-7143f34970dbf642c103f76c6387e6c6301d27b5.tar.bz2 nixlib-7143f34970dbf642c103f76c6387e6c6301d27b5.tar.lz nixlib-7143f34970dbf642c103f76c6387e6c6301d27b5.tar.xz nixlib-7143f34970dbf642c103f76c6387e6c6301d27b5.tar.zst nixlib-7143f34970dbf642c103f76c6387e6c6301d27b5.zip | |
chromium: Drop references to version 42 and below.
Since 7d217e3 the lowest version number is 43, so all those conditionals are no longer needed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications')
4 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 29e0da60ea07..a0bdc70f9f56 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -15,9 +15,6 @@ mkChromiumDerivation (base: rec { ${optionalString (versionOlder base.version "45.0.0.0") '' cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/" ''} - ${optionalString (versionOlder base.version "42.0.0.0") '' - cp -v "$buildPath/libpdf.so" "$libExecPath/" - ''} cp -v "$buildPath/chrome" "$libExecPath/$packageName" mkdir -vp "$out/share/man/man1" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f54f21ef8c07..714058d81e0b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -131,11 +131,7 @@ let chmod -R u+w third_party ''; - postPatch = optionalString (versionOlder version "42.0.0.0") '' - sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \ - sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH")); - ' sandbox/linux/suid/client/setuid_sandbox_client.cc - '' + '' + postPatch = '' sed -i -e '/module_path *=.*libexif.so/ { s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| }' chrome/utility/media_galleries/image_metadata_extractor.cc @@ -163,8 +159,6 @@ let use_openssl = useOpenSSL; selinux = enableSELinux; use_cups = cupsSupport; - } // optionalAttrs (versionOlder version "42.0.0.0") { - linux_sandbox_chrome_path="${libExecPath}/${packageName}"; } // { werror = ""; clang = false; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index a69b44c637a5..7a355cbf59ac 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -74,15 +74,12 @@ in stdenv.mkDerivation { sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox"; mkEnvVar = key: val: "--set '${key}' '${val}'"; envVars = chromium.plugins.settings.envVars or {}; - isVer42 = !stdenv.lib.versionOlder chromium.browser.version "42.0.0.0"; flags = chromium.plugins.settings.flags or []; - setBinPath = "--set CHROMIUM_SANDBOX_BINARY_PATH \"${sandboxBinary}\""; in with stdenv.lib; '' mkdir -p "$out/bin" "$out/share/applications" ln -s "${chromium.browser}/share" "$out/share" makeWrapper "${browserBinary}" "$out/bin/chromium" \ - ${optionalString (!isVer42) setBinPath} \ ${concatStrings (mapAttrsToList mkEnvVar envVars)} \ --add-flags "${concatStringsSep " " flags}" diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index b4766cee4347..5bb6a93d8d74 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -21,10 +21,9 @@ let chan = if source.channel == "dev" then "chrome-unstable" else if source.channel == "stable" then "chrome" else "chrome-${source.channel}"; - cext = if versionOlder source.version "41.0.0.0" then "lzma" else "xz"; in '' mkdir -p plugins - ar p "$src" data.tar.${cext} | tar xJ -C plugins --strip-components=4 \ + ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \ ./opt/google/${chan}/PepperFlash \ ./opt/google/${chan}/libwidevinecdm.so \ ./opt/google/${chan}/libwidevinecdmadapter.so |