From 92b968863a8890c83b66938878cf1b256a9d7a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Apr 2015 00:48:25 +0200 Subject: [PATCH] mesa: fix libudev path --- pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/development/libraries/mesa/dlopen-absolute-paths.diff | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 8747555070c..1fe3bef6481 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { ] ++ optional stdenv.isLinux (substituteAll { src = ./dlopen-absolute-paths.diff; - inherit udev; + inherit (udev) libudev; }); postPatch = '' diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff index 2b239e760ba..7eff8b32c59 100644 --- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff +++ b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff @@ -7,7 +7,7 @@ index 666d015..4d7a9be 100644 { if (!udev_handle) { - udev_handle = dlopen("libudev.so.1", RTLD_LOCAL | RTLD_LAZY); -+ udev_handle = dlopen("@udev@/lib/libudev.so.1", RTLD_LOCAL | RTLD_LAZY); ++ udev_handle = dlopen("@libudev@/lib/libudev.so.1", RTLD_LOCAL | RTLD_LAZY); if (!udev_handle) { /* libudev.so.1 changed the return types of the two unref functions