From 4ddd077bfa9ad497e795a7f60d7734daf62117c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 26 Apr 2013 12:15:54 +0200 Subject: [PATCH] find-runtime-roots.pl: Don't hardcode /nix/store --- scripts/find-runtime-roots.pl.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/find-runtime-roots.pl.in b/scripts/find-runtime-roots.pl.in index 5c2d4bed9..e1a2dde55 100755 --- a/scripts/find-runtime-roots.pl.in +++ b/scripts/find-runtime-roots.pl.in @@ -2,6 +2,7 @@ use strict; use Nix::Utils; +use Nix::Config; sub readProc { @@ -39,7 +40,7 @@ sub readProc { # Get all store paths that appear in the environment of this process. eval { my $env = Nix::Utils::readFile "$process/environ"; - my @matches = $env =~ /\/nix\/store\/[0-9a-z]+[0-9a-zA-Z\+\-\._\?=]*/g; + my @matches = $env =~ /\Q$Nix::Config::storeDir\E\/[0-9a-z]+[0-9a-zA-Z\+\-\._\?=]*/g; print "$_\n" foreach @matches; } }