diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-08-30 02:56:28 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2014-08-30 09:33:53 +0200 |
commit | 58bc1ef3d854f47d91d800d9bcfb9a0bee6bbcf1 (patch) | |
tree | de6fa89f0750cb50b356374e673265381721cccf | |
parent | 1ddc10946a36661cfb5e6fee3b2924faaa823c68 (diff) | |
download | nixlib-58bc1ef3d854f47d91d800d9bcfb9a0bee6bbcf1.tar nixlib-58bc1ef3d854f47d91d800d9bcfb9a0bee6bbcf1.tar.gz nixlib-58bc1ef3d854f47d91d800d9bcfb9a0bee6bbcf1.tar.bz2 nixlib-58bc1ef3d854f47d91d800d9bcfb9a0bee6bbcf1.tar.lz nixlib-58bc1ef3d854f47d91d800d9bcfb9a0bee6bbcf1.tar.xz nixlib-58bc1ef3d854f47d91d800d9bcfb9a0bee6bbcf1.tar.zst nixlib-58bc1ef3d854f47d91d800d9bcfb9a0bee6bbcf1.zip |
chromium: Remove all NSAPI browser wrappers.
Chromium doesn't support NSAPI anymore, so it doesn't make sense to keep the wrappers, especially because some of them trigger bugs in more recent versions of Chromium. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f990524d5c82..2305a3fe98f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8343,20 +8343,16 @@ let chatzilla = callPackage ../applications/networking/irc/chatzilla { }; - chromium = lowPrio (callPackage ../applications/networking/browsers/chromium { + chromium = callPackage ../applications/networking/browsers/chromium { channel = "stable"; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enablePepperPDF = config.chromium.enablePepperPDF or false; - }); + }; chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); - chromiumBetaWrapper = lowPrio (wrapChromium chromiumBeta); chromiumDev = lowPrio (chromium.override { channel = "dev"; }); - chromiumDevWrapper = lowPrio (wrapChromium chromiumDev); - - chromiumWrapper = wrapChromium chromium; cinelerra = callPackage ../applications/video/cinelerra { }; @@ -10069,13 +10065,6 @@ let wordnet = callPackage ../applications/misc/wordnet { }; - wrapChromium = browser: wrapFirefox { - inherit browser; - browserName = browser.packageName; - desktopName = "Chromium"; - icon = "${browser}/share/icons/hicolor/48x48/apps/${browser.packageName}.png"; - }; - wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }: |