sublime-merge: add redirect for /bin/true
Without it rebasing/squashing features are broken.
This commit is contained in:
parent
3531a229d1
commit
dc7c4d003c
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
|
{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
|
||||||
, pkexecPath ? "/run/wrappers/bin/pkexec"
|
, pkexecPath ? "/run/wrappers/bin/pkexec"
|
||||||
, writeScript, common-updater-scripts, curl, gnugrep
|
, writeScript, common-updater-scripts, curl, gnugrep, coreutils
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -18,7 +18,7 @@ let
|
||||||
arch = "x64";
|
arch = "x64";
|
||||||
|
|
||||||
libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ];
|
libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ];
|
||||||
redirects = [ "/usr/bin/pkexec=${pkexecPath}" ];
|
redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ];
|
||||||
in let
|
in let
|
||||||
binaryPackage = stdenv.mkDerivation {
|
binaryPackage = stdenv.mkDerivation {
|
||||||
pname = "${pname}-bin";
|
pname = "${pname}-bin";
|
||||||
|
|
Loading…
Reference in New Issue