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: fd3d64baa000
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b80b9a7b49e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 21, 2019

  1. zbar: disable Qt assertions 

    Greatly decreases zbar-lib transitive closure size: assertion messages
contain paths to Qt header files, causing zbar-lib to depend on
qtbase-dev.

The Qt specific mkDerivation normally does this automatically, but we
can't use it here due to having only a small part of the project being
Qt related.
    @delroth
    delroth committed Sep 21, 2019
    Copy the full SHA
    18b607b View commit details

  2. Merge pull request #69181 from delroth/zbar-qtbase 

    zbar: disable Qt assertions
    @Mic92
    Mic92 authored Sep 21, 2019
    Copy the full SHA
    5b80b9a View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/tools/graphics/zbar/default.nix
3 changes: 3 additions & 0 deletions pkgs/tools/graphics/zbar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
qtx11extras
];

# Disable assertions which include -dev QtBase file paths.
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];

configureFlags = [
"--without-python"
] ++ (if enableDbus then [