Merge pull request #111330 from dotlambda/libav-insecure
libav: mark as insecure
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
|
||||
{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, setJavaClassPath }:
|
||||
|
||||
let
|
||||
common = javaVersion:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
|
||||
, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib
|
||||
, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib
|
||||
, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg
|
||||
, swingSupport ? true }:
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
extension = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
libraries = [
|
||||
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL
|
||||
stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL
|
||||
xorg.libXxf86vm alsaLib fontconfig freetype pango
|
||||
gtk2 cairo gdk-pixbuf atk
|
||||
] ++ (lib.optionals swingSupport (with xorg; [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
|
||||
, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib
|
||||
, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib
|
||||
, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib
|
||||
, swingSupport ? true }:
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
extension = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
libraries = [
|
||||
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL
|
||||
stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL
|
||||
xorg.libXxf86vm alsaLib fontconfig freetype pango
|
||||
gtk2 cairo gdk-pixbuf atk zlib
|
||||
] ++ (lib.optionals swingSupport (with xorg; [
|
||||
|
||||
Reference in New Issue
Block a user