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: 73951bc0c8c0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
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

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    b6fce72 View commit details

  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

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    9cac8fe View commit details

  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

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    d375193 View commit details

  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

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    df8ee06 View commit details

  5. Merge pull request #50363 from matthewbauer/cleanups3 

    Fallout fixes from #50293
    @matthewbauer
    matthewbauer authored Nov 14, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    3f0bd4c View commit details
2 changes: 1 addition & 1 deletion pkgs/development/libraries/glib/setup-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas

# Install gschemas, if any, in a package-specific directory
glibPreInstallPhase() {
installFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
makeFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
}
preInstallPhases+=" glibPreInstallPhase"

4 changes: 2 additions & 2 deletions pkgs/development/libraries/mapnik/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# a distinct dev output makes python-mapnik fail
outputs = [ "out" ];

nativeBuildInputs = [ python scons ];
nativeBuildInputs = [ python ];

buildInputs =
[ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

prefixKey = "PREFIX=";

sconsFlags = [
configureFlags = [
"BOOST_INCLUDES=${boost.dev}/include"
"BOOST_LIBS=${boost.out}/lib"
"CAIRO_INCLUDES=${cairo.dev}/include"
2 changes: 1 addition & 1 deletion pkgs/development/tools/build-managers/scons/setup-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ if [ -z "$buildPhase" ]; then
buildPhase=sconsBuildPhase
fi

if [ -z "$installPhase" ]; then
if [ -z "$dontUseSconsInstall" -a -z "$installPhase" ]; then
installPhase=sconsInstallPhase
fi

2 changes: 0 additions & 2 deletions pkgs/games/dxx-rebirth/default.nix
View file
Original file line number Diff line number Diff line change
@@ -42,8 +42,6 @@ in stdenv.mkDerivation rec {
postInstall = ''
install -Dm644 ${music} $out/share/games/dxx-rebirth/d2xr-sc55-music.dxa
install -Dm644 -t $out/share/doc/dxx-rebirth *.txt
runHook postInstall
'';

meta = with stdenv.lib; {
8 changes: 3 additions & 5 deletions pkgs/misc/drivers/xboxdrv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,12 +11,10 @@ in stdenv.mkDerivation {
sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id";
};

patchPhase = ''
substituteInPlace Makefile --replace /usr/local "$out"
'';

makeFlags = "PREFIX=$(out)";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ scons libX11 libusb1 boost glib dbus-glib];
buildInputs = [ scons libX11 libusb1 boost glib dbus-glib ];
dontUseSconsInstall = true;

meta = with stdenv.lib; {
homepage = https://pingus.seul.org/~grumbel/xboxdrv/;