From 5e8fbb3dc4891257a5dc83a7300da4e85b423294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 1 Sep 2013 19:55:25 +0200 Subject: [PATCH] libreoffice: correctly pick python executable --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e1c9e2f0712..b28ff848c4f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { find . -type f -print0 | xargs -0 sed -i \ -e 's,! */bin/bash,!${bash}/bin/bash,' -e 's,\(!\|SHELL=\) */usr/bin/env bash,\1${bash}/bin/bash,' \ -e 's,! */usr/bin/perl,!${perl}/bin/perl,' -e 's,! */usr/bin/env perl,!${perl}/bin/perl,' \ - -e 's,! */usr/bin/python,!${python3}/bin/python,' -e 's,! */usr/bin/env python,!${python3}/bin/python,' + -e 's,! */usr/bin/python,!${python3}/bin/${python.executable},' -e 's,! */usr/bin/env python,!${python3}/bin/${python.executable},' #sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk '';