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

Commits on Nov 28, 2017

  1. cnijfilter2: specify --datadir for cnijlgmon3 

    If --datadir is not given, it uses '${datarootdir}/cnijlgmon3',
with the unsubstituted variable.
    @strout
    strout committed Nov 28, 2017
    Copy the full SHA
    8bc74a9 View commit details

  2. Merge pull request #32144 from strout/cnijfilter2-fix 

    cnijfilter2: specify --datadir for cnijlgmon3
    @orivej
    orivej authored Nov 28, 2017
    Copy the full SHA
    af0be16 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 pkgs/misc/cups/drivers/cnijfilter2/default.nix
1 change: 1 addition & 0 deletions pkgs/misc/cups/drivers/cnijfilter2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
--replace /usr/include/libusb-1.0 \
${libusb.dev}/include/libusb-1.0
./autogen.sh --prefix=$out --enable-progpath=$out/bin \
--datadir=$out/share \
--enable-libdir=/var/cache/cups
make
)