swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #197304 from vs49688/miniffmpeg-staging

Browse source
This commit is contained in:
Sandro 2022-11-12 23:40:47 +01:00 committed by GitHub
parent 6d7adea228 05a5700ae2
commit 950b794452
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/config/no-x-libs.nix
View file

@ -30,8 +30,8 @@ with lib;
beam = super.beam_nox;
cairo = super.cairo.override { x11Support = false; };
dbus = super.dbus.override { x11Support = false; };
ffmpeg_4 = super.ffmpeg_4.override { sdlSupport = false; vdpauSupport = false; };
ffmpeg_5 = super.ffmpeg_5.override { sdlSupport = false; vdpauSupport = false; };
ffmpeg_4 = super.ffmpeg_4-headless;
ffmpeg_5 = super.ffmpeg_5-headless;
gobject-introspection = super.gobject-introspection.override { x11Support = false; };
libva = super.libva-minimal;
networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };

4
pkgs/applications/audio/cyanrip/default.nix
View file

@ -4,7 +4,7 @@
, meson
, ninja
, pkg-config
, ffmpeg
, ffmpeg-headless
, libcdio
, libcdio-paranoia
, libmusicbrainz5
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ ffmpeg libcdio libcdio-paranoia libmusicbrainz5 curl ];
buildInputs = [ ffmpeg-headless libcdio libcdio-paranoia libmusicbrainz5 curl ];
meta = with lib; {
homepage = "https://github.com/cyanreg/cyanrip";

4
pkgs/development/compilers/openjdk/openjfx/11.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4, python2, ruby
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python2, ruby
, openjdk11-bootstrap }:
let
@ -19,7 +19,7 @@ let
sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ];
dontUseCmakeConfigure = true;

4
pkgs/development/compilers/openjdk/openjfx/15.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
, ffmpeg_4, python3, ruby }:
, ffmpeg_4-headless, python3, ruby }:
let
major = "15";
@ -21,7 +21,7 @@ let
sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;

4
pkgs/development/compilers/openjdk/openjfx/17.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
, ffmpeg_4, python3, ruby, icu68 }:
, ffmpeg_4-headless, python3, ruby, icu68 }:
let
major = "17";
@ -21,7 +21,7 @@ let
sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw=";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;

6
pkgs/development/libraries/ffmpegthumbnailer/default.nix
View file

@ -1,4 +1,4 @@
{ fetchFromGitHub, lib, stdenv, ffmpeg, cmake, libpng, pkg-config, libjpeg
{ fetchFromGitHub, lib, stdenv, ffmpeg-headless, cmake, libpng, pkg-config, libjpeg
}:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ffmpeg libpng libjpeg ];
buildInputs = [ ffmpeg-headless libpng libjpeg ];
cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ];
# https://github.com/dirkvdb/ffmpegthumbnailer/issues/215
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
This thumbnailer was designed to be as fast and lightweight as possible.
The only dependencies are ffmpeg and libpng.
";
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.gpl2Plus;
maintainers = [ maintainers.jagajaga ];
};

4
pkgs/servers/misc/navidrome/default.nix
View file

@ -4,7 +4,7 @@
, lib
, pkg-config
, stdenv
, ffmpeg
, ffmpeg-headless
, taglib
, zlib
, makeWrapper
@ -54,7 +54,7 @@ buildGoModule {
postFixup = lib.optionalString ffmpegSupport ''
wrapProgram $out/bin/navidrome \
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
--prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]}
'';
passthru = {

4
pkgs/tools/graphics/unpaper/default.nix
View file

@ -12,7 +12,7 @@
# runtime
, buildPackages
, ffmpeg_5
, ffmpeg_5-headless
# tests
, nixosTests
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
ffmpeg_5
ffmpeg_5-headless
];
passthru.tests = {

20
pkgs/top-level/all-packages.nix
View file

@ -15932,12 +15932,10 @@ with pkgs;
pipewire = callPackage ../development/libraries/pipewire {
# ffmpeg depends on SDL2 which depends on pipewire by default.
# Break the cycle by disabling pipewire support in our ffmpeg.
ffmpeg = ffmpeg.override {
SDL2 = SDL2.override {
pipewireSupport = false;
};
};
# Break the cycle by depending on ffmpeg-headless.
# Pipewire only uses libavcodec (via an SPA plugin), which isn't
# affected by the *-headless changes.
ffmpeg = ffmpeg-headless;
};
pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {};
@ -19266,7 +19264,7 @@ with pkgs;
gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg; });
callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg-headless; });
inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox;
});
@ -32609,9 +32607,7 @@ with pkgs;
enableX11 = config.unison.enableX11 or true;
};
unpaper = callPackage ../tools/graphics/unpaper {
ffmpeg_5 = ffmpeg_5-headless;
};
unpaper = callPackage ../tools/graphics/unpaper { };
unison-ucm = callPackage ../development/compilers/unison { };
@ -38042,9 +38038,7 @@ with pkgs;
gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };
navidrome = callPackage ../servers/misc/navidrome {
ffmpeg = ffmpeg-headless;
};
navidrome = callPackage ../servers/misc/navidrome { };
zalgo = callPackage ../tools/misc/zalgo { };