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: 5a5245ed8d5a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 67ea4fcd3b4c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 28, 2019

  1. lutris: use wineWowPackages 

    They are built by Hydra.
    @abbradar
    abbradar committed Jun 28, 2019
    Copy the full SHA
    62ef555 View commit details

  2. intel-media-driver: disable tests 

    Works only on hosts with suitable CPUs.

Fixes Hydra failures:
https://hydra.nixos.org/build/95442132
    @abbradar
    abbradar committed Jun 28, 2019
    Copy the full SHA
    67ea4fc View commit details
Showing with 3 additions and 1 deletion.
  1. +1 −1 pkgs/applications/misc/lutris/default.nix
  2. +2 −0 pkgs/development/libraries/intel-media-driver/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/misc/lutris/default.nix
View file
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ let
perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC
samba4 sane-backends openldap opencl-headers ocl-icd utillinux

(wine.override { wineBuild = "wineWow"; })
wineWowPackages.staging

# ZDOOM
soundfont-fluid bzip2 game-music-emu
2 changes: 2 additions & 0 deletions pkgs/development/libraries/intel-media-driver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DINSTALL_DRIVER_SYSCONF=OFF"
"-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri"
# Works only on hosts with suitable CPUs.
"-DMEDIA_RUN_TEST_SUITE=OFF"
];

nativeBuildInputs = [ cmake pkgconfig ];