Unverified Commit 7143f349 authored by aszlig's avatar aszlig
Browse files

chromium: Drop references to version 42 and below. 



Since 7d217e37 the lowest version number is 43, so all those conditionals
are no longer needed.

Signed-off-by: default avataraszlig <aszlig@redmoonstudios.org>
parent cadd675e

pkgs/applications/networking/browsers/chromium/browser.nix

+0 −3
Original line number Diff line number Diff line
@@ -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"

pkgs/applications/networking/browsers/chromium/common.nix

+1 −7
Original line number Diff line number Diff line
@@ -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;

pkgs/applications/networking/browsers/chromium/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -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}"

pkgs/applications/networking/browsers/chromium/plugins.nix

+1 −2
Original line number Diff line number Diff line
@@ -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