diff options
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/source/default.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/source/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index da962c6b7688..4e568aed5949 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, fetchpatch, patchutils, python , channel ? "stable" -, useOpenSSL # XXX }: with stdenv.lib; @@ -36,8 +35,6 @@ in stdenv.mkDerivation { --exclude='*/.*' ''; - opensslPatches = optional useOpenSSL openssl.patches; - prePatch = '' for i in $outputs; do eval patchShebangs "\$$i" @@ -45,10 +42,8 @@ in stdenv.mkDerivation { ''; patches = - (if versionOlder version "45.0.0.0" - then singleton ./nix_plugin_paths_44.patch - else singleton ./nix_plugin_paths_46.patch ++ - optional (!versionOlder version "46.0.0.0") ./build_fixes_46.patch) ++ + singleton ./nix_plugin_paths_46.patch ++ + singleton ./build_fixes_46.patch ++ singleton ./widevine.patch; patchPhase = let @@ -71,8 +66,6 @@ in stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ "$out/build/common.gypi" "$main/chrome/chrome_tests.gypi" - '' + optionalString useOpenSSL '' - cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl" ''; passthru = { |