nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-22 03:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

libdrm: 2.4.100 -> 2.4.102

Browse Source
This commit is contained in:
Devin Bayer 2020-06-18 13:04:29 +02:00
parent c334340d5c
commit 2ea669bcf2
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/libdrm/cross-build-nm-path.patch
View File

@ -17,18 +17,17 @@ Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
2 files changed, 7 insertions(+), 1 deletion(-) 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index e292554a..64607139 100644 --- meson.build.orig 2020-06-18 11:13:57.716321962 +0200
--- a/meson.build +++ meson.build 2020-06-18 11:19:50.456861311 +0200
+++ b/meson.build @@ -45,7 +45,7 @@
@@ -327,7 +327,7 @@ pkg.generate( cc = meson.get_compiler('c')
)
symbols_check = find_program('symbols-check.py')
env_test = environment() -prog_nm = find_program('nm')
-env_test.set('NM', find_program('nm').path()) +prog_nm = find_program(get_option('nm-path'))
+env_test.set('NM', find_program(get_option('nm-path')).path())
# Check for atomics
if with_libkms intel_atomics = false
subdir('libkms')
diff --git a/meson_options.txt b/meson_options.txt diff --git a/meson_options.txt b/meson_options.txt
index 8af33f1c..b4f46a52 100644 index 8af33f1c..b4f46a52 100644
--- a/meson_options.txt --- a/meson_options.txt

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

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libdrm"; pname = "libdrm";
version = "2.4.100"; version = "2.4.102";
src = fetchurl { src = fetchurl {
url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.bz2"; url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
sha256 = "0p8a1l3a3s40i81mawm8nhrbk7p97ss05qkawp1yx73c30lchz67"; sha256 = "0nx0bd9dhymdsd99v4ifib77yjirkvkxf5hzdkbr7qr8dhrzkjwb";
}; };
outputs = [ "out" "dev" "bin" ]; outputs = [ "out" "dev" "bin" ];