diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-29 11:52:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-29 11:52:32 +0100 |
commit | c527619db69e6f8dd886680681619903b57acb63 (patch) | |
tree | dfa5cba8200733c42864086e7a33a788c117d778 /pkgs/applications/networking | |
parent | a108b8617b78aa1a96504f08940a7667928378b1 (diff) | |
parent | 62b15996a71ff206038408a30eea290bfc8cda92 (diff) | |
download | nixpkgs-c527619db69e6f8dd886680681619903b57acb63.tar nixpkgs-c527619db69e6f8dd886680681619903b57acb63.tar.gz nixpkgs-c527619db69e6f8dd886680681619903b57acb63.tar.bz2 nixpkgs-c527619db69e6f8dd886680681619903b57acb63.tar.lz nixpkgs-c527619db69e6f8dd886680681619903b57acb63.tar.xz nixpkgs-c527619db69e6f8dd886680681619903b57acb63.tar.zst nixpkgs-c527619db69e6f8dd886680681619903b57acb63.zip |
Merge pull request #47485 from prusnak/remove-mozilla-plugins-trezor
mozilla-plugins/trezor: remove applications/networking/browsers/mozilla-plugins/trezor
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix | 46 |
2 files changed, 1 insertions, 48 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 8b06c35fe00..1c214230e4e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ , flashplayer, hal-flash , MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web -, trezor-bridge, bluejeans, djview4, adobe-reader +, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow @@ -55,7 +55,6 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell - ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix deleted file mode 100644 index 5f7f601b354..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, dpkg }: - -stdenv.mkDerivation { - name = "TREZOR-bridge-1.0.5"; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_amd64.deb; - sha256 = "0097h4v88yca4aayzprrh4pk03xvvj7ncz2mi83chm81gsr2v67z"; - } - else - fetchurl { - url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_i386.deb; - sha256 = "0xzbq78s3ivg00f0bj6gyjgf47pvjx2l4mm05jjmdar60bf1xr1n"; - }; - - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - - dontStrip = true; - dontPatchELF = true; - - unpackPhase = "${dpkg}/bin/dpkg-deb -x $src ."; - - installPhase = '' - mkdir -p $out/etc/udev/rules.d/ $out/lib/mozilla/plugins - cp ./lib/udev/rules.d/51-trezor-udev.rules $out/etc/udev/rules.d/ - cp ./usr/lib/mozilla/plugins/npBitcoinTrezorPlugin.so $out/lib/mozilla/plugins - ''; - - meta = with stdenv.lib; - { description = "Plugin for browser to TREZOR device communication"; - homepage = https://mytrezor.com; - license = licenses.unfree; - maintainers = with maintainers; [ ehmry ]; - # Download URL, .deb content & hash (yikes) changed, not version. - # New archive doesn't contain any Mozilla plugin at all. - broken = true; - platforms = platforms.linux; - }; - -} |