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

chromium: Drop references to version 42 and below.

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

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-06-19 19:35:30 +02:00
parent cadd675e7a
commit 7143f34970
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,9 +15,6 @@ mkChromiumDerivation (base: rec {
${optionalString (versionOlder base.version "45.0.0.0") '' ${optionalString (versionOlder base.version "45.0.0.0") ''
cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/" 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" cp -v "$buildPath/chrome" "$libExecPath/$packageName"
mkdir -vp "$out/share/man/man1" mkdir -vp "$out/share/man/man1"

8
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -131,11 +131,7 @@ let
chmod -R u+w third_party chmod -R u+w third_party
''; '';
postPatch = optionalString (versionOlder version "42.0.0.0") '' postPatch = ''
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
'' + ''
sed -i -e '/module_path *=.*libexif.so/ { sed -i -e '/module_path *=.*libexif.so/ {
s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")|
}' chrome/utility/media_galleries/image_metadata_extractor.cc }' chrome/utility/media_galleries/image_metadata_extractor.cc
@ -163,8 +159,6 @@ let
use_openssl = useOpenSSL; use_openssl = useOpenSSL;
selinux = enableSELinux; selinux = enableSELinux;
use_cups = cupsSupport; use_cups = cupsSupport;
} // optionalAttrs (versionOlder version "42.0.0.0") {
linux_sandbox_chrome_path="${libExecPath}/${packageName}";
} // { } // {
werror = ""; werror = "";
clang = false; clang = false;

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

@ -74,15 +74,12 @@ in stdenv.mkDerivation {
sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox"; sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox";
mkEnvVar = key: val: "--set '${key}' '${val}'"; mkEnvVar = key: val: "--set '${key}' '${val}'";
envVars = chromium.plugins.settings.envVars or {}; envVars = chromium.plugins.settings.envVars or {};
isVer42 = !stdenv.lib.versionOlder chromium.browser.version "42.0.0.0";
flags = chromium.plugins.settings.flags or []; flags = chromium.plugins.settings.flags or [];
setBinPath = "--set CHROMIUM_SANDBOX_BINARY_PATH \"${sandboxBinary}\"";
in with stdenv.lib; '' in with stdenv.lib; ''
mkdir -p "$out/bin" "$out/share/applications" mkdir -p "$out/bin" "$out/share/applications"
ln -s "${chromium.browser}/share" "$out/share" ln -s "${chromium.browser}/share" "$out/share"
makeWrapper "${browserBinary}" "$out/bin/chromium" \ makeWrapper "${browserBinary}" "$out/bin/chromium" \
${optionalString (!isVer42) setBinPath} \
${concatStrings (mapAttrsToList mkEnvVar envVars)} \ ${concatStrings (mapAttrsToList mkEnvVar envVars)} \
--add-flags "${concatStringsSep " " flags}" --add-flags "${concatStringsSep " " flags}"

3
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -21,10 +21,9 @@ let
chan = if source.channel == "dev" then "chrome-unstable" chan = if source.channel == "dev" then "chrome-unstable"
else if source.channel == "stable" then "chrome" else if source.channel == "stable" then "chrome"
else "chrome-${source.channel}"; else "chrome-${source.channel}";
cext = if versionOlder source.version "41.0.0.0" then "lzma" else "xz";
in '' in ''
mkdir -p plugins 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}/PepperFlash \
./opt/google/${chan}/libwidevinecdm.so \ ./opt/google/${chan}/libwidevinecdm.so \
./opt/google/${chan}/libwidevinecdmadapter.so ./opt/google/${chan}/libwidevinecdmadapter.so