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

libdrm: support valgrind suppression via a lighter version

Browse Source 
Fixes #25917.  It's all only about build-time dependency bloat and
consequent rebuild propagation.
This commit is contained in:
Vladimír Čunát 2017-05-19 17:18:07 +02:00
parent f71b83ad7e
commit b4bb39642e
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libdrm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
stdenv.mkDerivation rec {
name = "libdrm-2.4.81";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libpthreadstubs libpciaccess ];
buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
# libdrm as of 2.4.70 does not actually do anything with udev.
patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
preConfigure = stdenv.lib.optionalString stdenv.isDarwin
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
configureFlags = [ "--disable-valgrind" ]
configureFlags = [ ]
++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
++ stdenv.lib.optional stdenv.isDarwin "-C";

3
pkgs/top-level/all-packages.nix
View File

@ -7154,7 +7154,8 @@ with pkgs;
valgrind = callPackage ../development/tools/analysis/valgrind {
inherit (darwin) xnu bootstrap_cmds cctools;
llvm = llvm_39;
};
};
valgrind-light = self.valgrind.override { gdb = null; };
valkyrie = callPackage ../development/tools/analysis/valkyrie { };