diff options
author | Peter Hoeg <peter@hoeg.com> | 2018-04-16 17:30:42 +0800 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2018-05-02 12:26:54 +0200 |
commit | 490e6fc9eb051b93482761ab667697972a259b34 (patch) | |
tree | 81c8dce2b23ce745277cdfdbfbcfc40f0eb9643c | |
parent | a0dd9713e31bf2dfbe33ed50f2915d1c654344db (diff) | |
download | nixlib-490e6fc9eb051b93482761ab667697972a259b34.tar nixlib-490e6fc9eb051b93482761ab667697972a259b34.tar.gz nixlib-490e6fc9eb051b93482761ab667697972a259b34.tar.bz2 nixlib-490e6fc9eb051b93482761ab667697972a259b34.tar.lz nixlib-490e6fc9eb051b93482761ab667697972a259b34.tar.xz nixlib-490e6fc9eb051b93482761ab667697972a259b34.tar.zst nixlib-490e6fc9eb051b93482761ab667697972a259b34.zip |
vlc_npapi: drop it as firefox no longer support NPAPI
-rw-r--r-- | pkgs/applications/video/vlc/plugin.nix | 34 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 1 insertions, 38 deletions
diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix deleted file mode 100644 index 583d978a5514..000000000000 --- a/pkgs/applications/video/vlc/plugin.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchgit, vlc, autoconf, automake, libtool, pkgconfig, npapi_sdk, -libxcb, xlibsWrapper, gtk}: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "vlc-plugin-${version}"; - version = "2.2.2"; # This 2.2.2 builds fine with vlc 2.2.4 - - src = fetchgit { - url = "https://code.videolan.org/videolan/npapi-vlc.git"; - rev = "5fa6fbc11cf5bad983f57656c0085e47e18fbf20"; - sha256 = "0k4s0657kv1mx1md8vj87scs0hz59xy7syqdsxb48w3w8gnfljs0"; - }; - - preConfigure = "sh autogen.sh"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vlc autoconf automake libtool npapi_sdk libxcb - xlibsWrapper gtk ]; - - enableParallelBuilding = true; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - meta = with stdenv.lib; { - description = "Webplugins based on libVLC (for firefox, npapi)"; - homepage = https://code.videolan.org/videolan/npapi-vlc; - platforms = platforms.linux; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 451239b54354..482f2e024844 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18183,11 +18183,8 @@ with pkgs; vkeybd = callPackage ../applications/audio/vkeybd {}; vlc = libsForQt5.vlc; - vlc_qt5 = vlc; - vlc_npapi = callPackage ../applications/video/vlc/plugin.nix { - gtk = gtk2; - }; + vlc_qt5 = vlc; vmpk = callPackage ../applications/audio/vmpk { }; |