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
base: 73951bc0c8c0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3f0bd4c33452
Choose a head ref
  • 5 commits
  • 5 files changed
  • 1 contributor

Commits on Nov 14, 2018

  1. xboxdrv: add dontUseSconsInstall flag 

    xboxdrv doesn’t use scons for installing, but instead using a
makefile! Everything else is in scons so we have to keep that. I’ve
added a dontUseSconsInstall flag to the scons setup-hook to skip the
automatic overwrite of default “make install” call.
    @matthewbauer
    matthewbauer committed Nov 14, 2018
    Copy the full SHA
    b6fce72 View commit details
    Browse the repository at this point in the history

  2. mapnik: use provided configure script 

    This gives us support for the class autoconf “./configure && make &&
make install” build-style.
    @matthewbauer
    matthewbauer committed Nov 14, 2018
    Copy the full SHA
    9cac8fe View commit details
    Browse the repository at this point in the history

  3. dxx-rebirth: prevent infinite loop 

    The postInstall phase should not run postInstall itself! My mistake in
renaming the old installPhase.
    @matthewbauer
    matthewbauer committed Nov 14, 2018
    Copy the full SHA
    d375193 View commit details
    Browse the repository at this point in the history

  4. glib: only add gsettingsschemadir in make 

    gsettingsschemedir only works in make where you can set any variable
from the command line as in “make VAR=VAL”. Other build systems may
not support this kind of loose overriding of variables. This broke a
scons build here:

  https://hydra.nixos.org/build/84073119/
    @matthewbauer
    matthewbauer committed Nov 14, 2018
    Copy the full SHA
    df8ee06 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #50363 from matthewbauer/cleanups3 

    Fallout fixes from #50293
    @matthewbauer
    matthewbauer committed Nov 14, 2018
    Copy the full SHA
    3f0bd4c View commit details
    Browse the repository at this point in the history