summaryrefslogtreecommitdiff
path: root/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-04-04 00:29:19 -0400
committerJoey Hess2014-04-04 00:29:19 -0400
commitba8a259f24e15c1e1005bed628ceed8e374e963a (patch)
treea8b25f1cbd1ee3e8a0f58a2fa62706fcbebfc4a5 /Propellor/Property
parentdd08ae61dbbf01e9ed8a69549b14892057a375bb (diff)
propellor spin
Diffstat (limited to 'Propellor/Property')
-rw-r--r--Propellor/Property/Docker/Shim.hs5
1 files changed, 5 insertions, 0 deletions
diff --git a/Propellor/Property/Docker/Shim.hs b/Propellor/Property/Docker/Shim.hs
index a210e162..7d4f56f6 100644
--- a/Propellor/Property/Docker/Shim.hs
+++ b/Propellor/Property/Docker/Shim.hs
@@ -29,10 +29,15 @@ setup propellorbin dest = do
let linker = (dest ++) $
fromMaybe (error "cannot find ld-linux linker") $
headMaybe $ filter ("ld-linux" `isInfixOf`) libs'
+ let gconvdir = (dest ++) $ parentDir $
+ fromMaybe (error "cannot find gconv directory") $
+ headMaybe $ filter ("/gconv/" `isInfixOf`) glibclibs
let linkerparams = ["--library-path", intercalate ":" libdirs ]
let shim = file propellorbin dest
writeFile shim $ unlines
[ "#!/bin/sh"
+ , "set GCONV_PATH=" ++ shellEscape gconvdir
+ , "export GCONV_PATH"
, "exec " ++ unwords (map shellEscape $ linker : linkerparams) ++
" " ++ shellEscape propellorbin ++ " \"$@\""
]