Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

2 files changed, 3 insertions, 53 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch b/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
deleted file mode 100644
index 547ef0d09691..000000000000
--- a/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9e05fece7918edce9c6aa5a1f1ea375108e5b2be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
-Date: Fri, 2 Aug 2019 10:26:37 +0100
-Subject: [PATCH] meson: support for custom nm path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When cross-compiling target toolchains i.e. binutils are often
-prefixed by its target architecture. This patch gives the user
-to option to specify the nm used during the build process.
-
-Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
----
- meson.build       | 2 +-
- meson_options.txt | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
---- meson.build.orig	2020-06-18 11:13:57.716321962 +0200
-+++ meson.build	2020-06-18 11:19:50.456861311 +0200
-@@ -45,7 +45,7 @@
- cc = meson.get_compiler('c')
-
- symbols_check = find_program('symbols-check.py')
--prog_nm = find_program('nm')
-+prog_nm = find_program(get_option('nm-path'))
-
- # Check for atomics
- intel_atomics = false
-diff --git a/meson_options.txt b/meson_options.txt
-index 8af33f1c..b4f46a52 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -141,3 +141,9 @@ option(
-   value : false,
-   description : 'Enable support for using udev instead of mknod.',
- )
-+option(
-+  'nm-path',
-+  type : 'string',
-+  description : 'path to nm',
-+  value : 'nm'
-+)
--- 
-2.22.0
-
diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
index e08a46732480..e49a903730b9 100644
--- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdrm";
-  version = "2.4.110";
+  version = "2.4.112";
 
   src = fetchurl {
     url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0dwpry9m5l27dlhq48j4bsiqwm0247cxdqwv3b7ddmkynk2f9kpf";
+    sha256 = "1zr0hi7k5s7my4q9hyj6ryzg89zyjx24zbqfv3c5rcq9pl87gc00";
   };
 
   outputs = [ "out" "dev" "bin" ];
@@ -18,13 +18,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpthreadstubs libpciaccess ]
     ++ lib.optional withValgrind valgrind-light;
 
-  patches = [ ./cross-build-nm-path.patch ];
-
   mesonFlags = [
-    "-Dnm-path=${stdenv.cc.targetPrefix}nm"
     "-Dinstall-test-programs=true"
     "-Domap=true"
-  ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [
+  ] ++ lib.optionals stdenv.hostPlatform.isAarch [
     "-Dtegra=true"
     "-Detnaviv=true"
   ];