diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-19 22:27:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 22:27:31 +0100 |
| commit | ace7950a793a0543556d39548a87b189370e1d41 (patch) | |
| tree | 915f59a8c8dd258d4bfaf5a60750442adec0f250 | |
| parent | fcae6a26560bd5744885a0e40f381ba55eecccad (diff) | |
| parent | 3d7b9b03568d1a9e08a08b13c9ac945bd43e8e64 (diff) | |
| download | nixpkgs-ace7950a793a0543556d39548a87b189370e1d41.tar nixpkgs-ace7950a793a0543556d39548a87b189370e1d41.tar.gz nixpkgs-ace7950a793a0543556d39548a87b189370e1d41.tar.bz2 nixpkgs-ace7950a793a0543556d39548a87b189370e1d41.tar.lz nixpkgs-ace7950a793a0543556d39548a87b189370e1d41.tar.xz nixpkgs-ace7950a793a0543556d39548a87b189370e1d41.tar.zst nixpkgs-ace7950a793a0543556d39548a87b189370e1d41.zip | |
Merge pull request #206454 from SuperSandro2000/libextractor
| -rw-r--r-- | nixos/modules/config/no-x-libs.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/libextractor/default.nix | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 3efadea8235..492745a47fd 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -35,6 +35,7 @@ with lib; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; + libextractor = super.libextractor.override { gstreamerSupport = false; gtkSupport = false; }; libva = super.libva-minimal; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 29762e231f2..3df4a8f91e3 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, rpm, pkg-config -, gstreamerSupport ? true, gst_all_1 ? null +, gstreamerSupport ? true, gst_all_1 # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). , gstPlugins ? (gst: [ gst.gst-plugins-base gst.gst-plugins-good ]) @@ -12,12 +12,9 @@ # wrapProgram $out/bin/extract --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" # ''; # See also <https://nixos.org/nixpkgs/manual/#sec-language-gnome>. -, gtkSupport ? true, glib ? null, gtk3 ? null -, videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: - -assert gstreamerSupport -> gst_all_1 != null && builtins.isList (gstPlugins gst_all_1); -assert gtkSupport -> glib != null && gtk3 != null; -assert videoSupport -> ffmpeg != null && libmpeg2 != null; +, gtkSupport ? true, glib, gtk3 +, videoSupport ? true, ffmpeg, libmpeg2 +}: stdenv.mkDerivation rec { pname = "libextractor"; |