diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-19 17:18:07 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-27 11:08:23 +0200 |
| commit | b4bb39642e80205355593468d8514c7e6a27d96a (patch) | |
| tree | f3a4755d37645c19c485cf21004981369229e1ae /pkgs/development/libraries/libdrm | |
| parent | f71b83ad7e61137f552ee96be8f6ca7bdc29d357 (diff) | |
| download | nixpkgs-b4bb39642e80205355593468d8514c7e6a27d96a.tar nixpkgs-b4bb39642e80205355593468d8514c7e6a27d96a.tar.gz nixpkgs-b4bb39642e80205355593468d8514c7e6a27d96a.tar.bz2 nixpkgs-b4bb39642e80205355593468d8514c7e6a27d96a.tar.lz nixpkgs-b4bb39642e80205355593468d8514c7e6a27d96a.tar.xz nixpkgs-b4bb39642e80205355593468d8514c7e6a27d96a.tar.zst nixpkgs-b4bb39642e80205355593468d8514c7e6a27d96a.zip | |
libdrm: support valgrind suppression via a lighter version
Fixes #25917. It's all only about build-time dependency bloat and consequent rebuild propagation.
Diffstat (limited to 'pkgs/development/libraries/libdrm')
| -rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4071b607d22..a8cf2864807 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -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"; |