From e62db105c4bc1837cff46702d760c3e04403b6b5 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 13 Nov 2018 12:26:13 +0100 Subject: [PATCH] libredirect: specify libName reduces a bit of duplication and can also be used from the outside: export LD_PRELOAD=${libredirect}/lib/${libredirect.libName} --- pkgs/build-support/libredirect/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 09a3da6729a9..e92945a4030c 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { cp ${./test.c} test.c ''; - shlibext = stdenv.targetPlatform.extensions.sharedLibrary; + libName = "libredirect" + stdenv.targetPlatform.extensions.sharedLibrary; buildPhase = '' $CC -Wall -std=c99 -O3 -shared libredirect.c \ - -o "libredirect$shlibext" -fPIC -ldl + -o "$libName" -fPIC -ldl if [ -n "$doInstallCheck" ]; then $CC -Wall -std=c99 -O3 test.c -o test @@ -20,18 +20,18 @@ stdenv.mkDerivation { ''; installPhase = '' - install -vD "libredirect$shlibext" "$out/lib/libredirect$shlibext" + install -vD "$libName" "$out/lib/$libName" ''; doInstallCheck = true; installCheckPhase = if stdenv.isDarwin then '' NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true" \ - DYLD_INSERT_LIBRARIES="$out/lib/libredirect$shlibext" \ + DYLD_INSERT_LIBRARIES="$out/lib/$libName" \ DYLD_FORCE_FLAT_NAMESPACE=1 ./test '' else '' NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true" \ - LD_PRELOAD="$out/lib/libredirect$shlibext" ./test + LD_PRELOAD="$out/lib/$libName" ./test ''; meta = {