forked from NixOS/nixpkgs
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
libeatmydata: fix launcher script - find shell library properly
The new version of the launcher script in version 105 doesn't have the NixOS#8665 bug, but it does try to find the shell library using Debian tools, which obviously doesn't work on Nix. Removed the now-unneccessary makeWrapper and patched out the Debian bits. (cherry picked from commit 4e9b948)
- Loading branch information
Showing
2 changed files
with
25 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
pkgs/development/libraries/libeatmydata/find-shell-lib.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- eatmydata.in 2020-02-01 18:10:59.618679823 -0800 | ||
+++ eatmydata.in.new 2020-02-01 18:08:25.092620247 -0800 | ||
@@ -15,15 +15,8 @@ | ||
# You should have received a copy of the GNU General Public License | ||
# along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
-export `dpkg-architecture|grep DEB_BUILD_MULTIARCH` | ||
- | ||
-shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh" | ||
-if [ -f "$shlib" ]; then | ||
- . "$shlib" | ||
-else | ||
- echo "Unable to locate eatmydata shell library, it was not enabled" >&2 | ||
- exec "$@" | ||
-fi | ||
+shlib="NIX_OUT_DIR/libexec/eatmydata.sh" | ||
+. "$shlib" | ||
|
||
usage() | ||
{ |