sane-scripts: remove /run/wrappers hack now that prologue is fixed in resholve
This commit is contained in:
parent
67cddecab4
commit
a9096f3312
|
@ -70,8 +70,7 @@ resholve.mkDerivation {
|
||||||
# not sure if/where that lack of suid causes problems.
|
# not sure if/where that lack of suid causes problems.
|
||||||
umount = true;
|
umount = true;
|
||||||
};
|
};
|
||||||
# prologue is broken; see <https://github.com/abathur/resholve/issues/89>
|
prologue = "bin/sane-resholve-prologue";
|
||||||
# prologue = "bin/prologue";
|
|
||||||
|
|
||||||
# list of programs which *can* or *cannot* exec their arguments
|
# list of programs which *can* or *cannot* exec their arguments
|
||||||
execer = with pkgs; [
|
execer = with pkgs; [
|
||||||
|
@ -102,8 +101,6 @@ resholve.mkDerivation {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cp -R * $out/bin/
|
cp -R * $out/bin/
|
||||||
# allow scripts to make use of sudo, umount wrappers
|
|
||||||
sed -i '3iPATH=$PATH:/run/wrappers/bin' $out/bin/*;
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
3
pkgs/sane-scripts/src/sane-resholve-prologue
Normal file
3
pkgs/sane-scripts/src/sane-resholve-prologue
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
# sudo, umount, others, are located here.
|
||||||
|
# resholve can't inline their path, since it's not a store path
|
||||||
|
PATH=$PATH:/run/wrappers/bin
|
Loading…
Reference in New Issue
Block a user