lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

dust: fix

- Use `pixie` (the wrapper) rather than `pixie-vm` (the wrappee)
- Add `rlwrap` command rather than using `which`

Fixes #72129

+8 -8
+5 -2
pkgs/development/interpreters/pixie/dust.nix
··· 1 - { lib, stdenv, pixie, fetchFromGitHub }: 1 + { lib, stdenv, fetchFromGitHub 2 + , pixie, rlwrap 3 + }: 2 4 3 5 stdenv.mkDerivation rec { 4 6 pname = "dust"; ··· 16 18 patches = [ ./make-paths-configurable.patch ]; 17 19 18 20 configurePhase = '' 19 - pixiePath="${pixie}/bin/pixie-vm" \ 21 + pixiePath="${pixie}/bin/pixie" \ 20 22 basePath="$out/share/dust" \ 23 + rlwrapPath="${rlwrap}/bin/rlwrap" \ 21 24 substituteAll dust.in dust 22 25 chmod +x dust 23 26 '';
+3 -6
pkgs/development/interpreters/pixie/make-paths-configurable.patch
··· 73 73 index 0000000..44a7fbd 74 74 --- /dev/null 75 75 +++ b/dust.in 76 - @@ -0,0 +1,43 @@ 76 + @@ -0,0 +1,40 @@ 77 77 +#!/usr/bin/env bash 78 78 + 79 79 +base_path=@basePath@ 80 80 +pixie_path=@pixiePath@ 81 + +rlwrap_cmd=@rlwrapPath@ 81 82 + 82 83 +function set_load_path() { 83 84 + load_path="" ··· 98 99 + 99 100 +case $1 in 100 101 + ""|"repl") 101 - + rlwrap_cmd="" 102 - + if [ -n "`which rlwrap`" ]; then 103 - + rlwrap_cmd="rlwrap -aignored -n" 104 - + fi 105 - + $rlwrap_cmd $pixie_path $load_path 102 + + $rlwrap_cmd -aignored -n $pixie_path $load_path 106 103 + ;; 107 104 + "run") 108 105 + shift