public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50363 from matthewbauer/cleanups3

Browse Source 
Fallout fixes from #50293
This commit is contained in:
Matthew Bauer 2018-11-14 16:39:28 -06:00 committed by GitHub
commit 3f0bd4c334
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/glib/setup-hook.sh
View File

@ -9,7 +9,7 @@ addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas
# Install gschemas, if any, in a package-specific directory # Install gschemas, if any, in a package-specific directory
glibPreInstallPhase() { 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" preInstallPhases+=" glibPreInstallPhase"

4
pkgs/development/libraries/mapnik/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# a distinct dev output makes python-mapnik fail # a distinct dev output makes python-mapnik fail
outputs = [ "out" ]; outputs = [ "out" ];
nativeBuildInputs = [ python scons ]; nativeBuildInputs = [ python ];
buildInputs = buildInputs =
[ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
prefixKey = "PREFIX="; prefixKey = "PREFIX=";
sconsFlags = [ configureFlags = [
"BOOST_INCLUDES=${boost.dev}/include" "BOOST_INCLUDES=${boost.dev}/include"
"BOOST_LIBS=${boost.out}/lib" "BOOST_LIBS=${boost.out}/lib"
"CAIRO_INCLUDES=${cairo.dev}/include" "CAIRO_INCLUDES=${cairo.dev}/include"

2
pkgs/development/tools/build-managers/scons/setup-hook.sh
View File

@ -75,7 +75,7 @@ if [ -z "$buildPhase" ]; then
buildPhase=sconsBuildPhase buildPhase=sconsBuildPhase
fi fi
if [ -z "$installPhase" ]; then if [ -z "$dontUseSconsInstall" -a -z "$installPhase" ]; then
installPhase=sconsInstallPhase installPhase=sconsInstallPhase
fi fi

2
pkgs/games/dxx-rebirth/default.nix
View File

@ -42,8 +42,6 @@ in stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
install -Dm644 ${music} $out/share/games/dxx-rebirth/d2xr-sc55-music.dxa install -Dm644 ${music} $out/share/games/dxx-rebirth/d2xr-sc55-music.dxa
install -Dm644 -t $out/share/doc/dxx-rebirth *.txt install -Dm644 -t $out/share/doc/dxx-rebirth *.txt
runHook postInstall
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

8
pkgs/misc/drivers/xboxdrv/default.nix
View File

@ -11,12 +11,10 @@ in stdenv.mkDerivation {
sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id"; sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id";
}; };
patchPhase = '' makeFlags = "PREFIX=$(out)";
substituteInPlace Makefile --replace /usr/local "$out"
'';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ scons libX11 libusb1 boost glib dbus-glib]; buildInputs = [ scons libX11 libusb1 boost glib dbus-glib ];
dontUseSconsInstall = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://pingus.seul.org/~grumbel/xboxdrv/; homepage = https://pingus.seul.org/~grumbel/xboxdrv/;