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

libdrm: don't depend on valgrind when it is not available (armv6l)

Browse Source
This commit is contained in:
Ben Wolsieffer 2019-07-20 13:13:21 -04:00
parent 735fbfa8bc
commit 18e0f9d39f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess, valgrind-light }: { stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
, withValgrind ? valgrind-light.meta.available, valgrind-light
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libdrm"; pname = "libdrm";
@ -12,7 +14,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "bin" ]; outputs = [ "out" "dev" "bin" ];
nativeBuildInputs = [ pkgconfig meson ninja ]; nativeBuildInputs = [ pkgconfig meson ninja ];
buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; buildInputs = [ libpthreadstubs libpciaccess ]
++ lib.optional withValgrind valgrind-light;
patches = [ ./cross-build-nm-path.patch ]; patches = [ ./cross-build-nm-path.patch ];
@ -22,14 +25,13 @@ stdenv.mkDerivation rec {
done done
''; '';
mesonFlags = mesonFlags = [
[ "-Dnm-path=${stdenv.cc.targetPrefix}nm"
"-Dnm-path=${stdenv.cc.targetPrefix}nm" "-Dinstall-test-programs=true"
"-Dinstall-test-programs=true" ] ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [
++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) "-Dtegra=true"
[ "-Dtegra=true" "-Detnaviv=true" ] "-Detnaviv=true"
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false";
;
enableParallelBuilding = true; enableParallelBuilding = true;
@ -37,6 +39,6 @@ stdenv.mkDerivation rec {
homepage = https://dri.freedesktop.org/libdrm/; homepage = https://dri.freedesktop.org/libdrm/;
description = "Library for accessing the kernel's Direct Rendering Manager"; description = "Library for accessing the kernel's Direct Rendering Manager";
license = "bsd"; license = "bsd";
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }