diff options
| -rw-r--r-- | pkgs/development/tools/build-managers/scons/setup-hook.sh | 2 | ||||
| -rw-r--r-- | pkgs/misc/drivers/xboxdrv/default.nix | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/tools/build-managers/scons/setup-hook.sh b/pkgs/development/tools/build-managers/scons/setup-hook.sh index bb5591c46203..55159aa5a93a 100644 --- a/pkgs/development/tools/build-managers/scons/setup-hook.sh +++ b/pkgs/development/tools/build-managers/scons/setup-hook.sh @@ -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 diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 3cc7869eb0a7..c942ec59f37e 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -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/; |