Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 597b1d9e2c41
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 11e0f5993b1c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 11, 2020

  1. gst_all_1.gst-plugins-bad: disable zbar by default 

    gst-plugins-bad by default used to pull in gtk3 and qtbase and qtx11extras because of the default dependency on zbar.
As zbar is a rarely needed gstreamer plugin, this unnecessarily
increased the closure size.
I am only aware of gnome-keysign actually using the zbar plugin, so that
uses a zbar-enabled gst-plugins-bad.

closes #84845
    @schmittlauch
    schmittlauch committed Apr 11, 2020
    Copy the full SHA
    2df7f92 View commit details

  2. Merge pull request #84956 from schmittlauch/gst-disable-zbar 

    gst-plugins-bad: disable zbar by default
    @jtojnar
    jtojnar authored Apr 11, 2020
    Copy the full SHA
    11e0f59 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/development/libraries/gstreamer/bad/default.nix
  2. +1 −1 pkgs/tools/security/gnome-keysign/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/gstreamer/bad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
, gst-plugins-base
, orc
, gobject-introspection
, enableZbar ? true
, enableZbar ? false
, faacSupport ? false
, faac ? null
, faad2
2 changes: 1 addition & 1 deletion pkgs/tools/security/gnome-keysign/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gst-plugins-bad # for zbar plug-in
(gst_all_1.gst-plugins-bad.override { enableZbar = true; }) # for zbar plug-in
];

propagatedBuildInputs = with python3.pkgs; [