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: cb9f953c923e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 377e0d3bd391
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 6, 2017

  1. Copy the full SHA
    3729247 View commit details

Commits on Jun 10, 2017

  1. Merge pull request #26418 from lheckemann/mesa-valgrind

    mesa: add valgrind support
    Mic92 authored Jun 10, 2017
    Copy the full SHA
    377e0d3 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/libraries/mesa/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/libraries/mesa/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, pkgconfig, intltool, autoreconfHook, substituteAll
, file, expat, libdrm, xorg, wayland, openssl
, llvmPackages, libffi, libomxil-bellagio, libva
, libelf, libvdpau
, libelf, libvdpau, valgrind-light
, grsecEnabled ? false
, enableRadv ? false
# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
@@ -152,6 +152,7 @@ stdenv.mkDerivation {
libX11 libXext libxcb libXt libXfixes libxshmfence
libffi wayland libvdpau libelf libXvMC
libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
valgrind-light
];