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

Commits on Jul 1, 2017

  1. splix: enable JBIG 

    Enables JBIG given that according to OpenPrinting.org, the patents have expired.
See https://www.openprinting.org/driver/splix/license/

Closes #25929
    Emmanuel Rosa committed Jul 1, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0878ca7 View commit details

Commits on Jul 2, 2017

  1. Merge pull request #27027 from emmanuelrosa/splix-jbig 

    splix: enable JBIG
    @FRidh
    FRidh authored Jul 2, 2017
    Copy the full SHA
    9143cc6 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/misc/cups/drivers/splix/default.nix
2 changes: 1 addition & 1 deletion pkgs/misc/cups/drivers/splix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};

preBuild = ''
makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
makeFlags="V=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
'';

buildInputs = [cups zlib];