diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-08-01 23:06:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-01 23:06:51 +0200 |
| commit | 09cb5e84166155817fb94bcae5cfa8d3fa420917 (patch) | |
| tree | 12358257eadb935ab3ebd8e78fc1f5ec67a73c0a /pkgs/development/libraries/libdrm | |
| parent | f5c886d892e436f6d270e93560c2b47cff983e13 (diff) | |
| parent | 9f309c8792577a16b319956ad92a2df2ae9aa4f1 (diff) | |
Merge pull request #183507 from Artturin/stdenvmeson1
Diffstat (limited to 'pkgs/development/libraries/libdrm')
| -rw-r--r-- | pkgs/development/libraries/libdrm/cross-build-nm-path.patch | 47 | ||||
| -rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 3 |
2 files changed, 0 insertions, 50 deletions
diff --git a/pkgs/development/libraries/libdrm/cross-build-nm-path.patch b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch deleted file mode 100644 index 547ef0d096915..0000000000000 --- a/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/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index ec12f1031cf56..e49a903730b95 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -18,10 +18,7 @@ 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.hostPlatform.isAarch [ |