On Fri, 2020-10-23 at 12:48 +0200, Ludovic Courtès wrote: > Hi Eric, > > Eric Bavier skribis: > > > From 7caaea0b21e5b97836b1a40a44efd2f38dbab7ae Mon Sep 17 00:00:00 2001 > > From: Eric Bavier > > Date: Wed, 21 Oct 2020 18:33:52 -0500 > > Subject: [PATCH 1/2] guix: pack: Fix offset calculation for store directory > > mount point. > > > > Fixes wrapping of non-package things, where the target store directory may > > differ in length from the original. > > > > * guix/scripts/pack.scm (wrapped-package): Define > > WRAPPER_PROGRAM macro with wrapper's file name. > > * gnu/packages/aux-files/run-in-namespace.c (main): Offset index by len of > > that file name. > > LGTM! Perhaps add a link to this discussion in the commit log. > > > From 85bd962e929924b016a85d3a0b3dff434ebe8de3 Mon Sep 17 00:00:00 2001 > > From: Eric Bavier > > Date: Mon, 24 Feb 2020 23:47:02 -0600 > > Subject: [PATCH 2/2] guix: pack: Only wrap executable files. > > > > * guix/scripts/pack.scm (wrapped-package): Build wrappers for > > executable files and symlink others. > > * tests/guix-pack-relocatable.sh: Test relocatable example of mixed > > executable and non-executable files. > > LGTM too! > > Thanks, > Ludo’. Pushed in a73896425e92e5162766afdf042748b18f2462af and 4184998c70f9c4af101feb28cc19c5550abffcec after some small changes to the test to more faithfully mimic the failure case that was causing wrapped git commands to fail. `~Eric