diff options
author | Herwig Hochleitner <herwig@bendlas.net> | 2016-08-19 02:31:18 +0200 |
---|---|---|
committer | Herwig Hochleitner <herwig@bendlas.net> | 2016-08-19 02:38:12 +0200 |
commit | d620f8031836e7f9649a04c17a9586df9d595629 (patch) | |
tree | 78101d73329ed9831a20ecbb4409ae67663675fd /pkgs/development | |
parent | df2a847b6de506b8156d1275bdcb086d72e4d5ba (diff) | |
download | nixlib-d620f8031836e7f9649a04c17a9586df9d595629.tar nixlib-d620f8031836e7f9649a04c17a9586df9d595629.tar.gz nixlib-d620f8031836e7f9649a04c17a9586df9d595629.tar.bz2 nixlib-d620f8031836e7f9649a04c17a9586df9d595629.tar.lz nixlib-d620f8031836e7f9649a04c17a9586df9d595629.tar.xz nixlib-d620f8031836e7f9649a04c17a9586df9d595629.tar.zst nixlib-d620f8031836e7f9649a04c17a9586df9d595629.zip |
pixie, dust: rename pxi -> pixie-vm
see https://github.com/pixie-lang/pixie/issues/455
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/pixie/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/interpreters/pixie/dust.nix | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index a0ac515d78e2..c3da770a6e1f 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -63,11 +63,17 @@ let mkdir -p $out/share $out/bin cp pixie-src/pixie-vm $out/share/pixie-vm cp -R pixie-src/pixie $out/share/pixie - makeWrapper $out/share/pixie-vm $out/bin/pxi \ + makeWrapper $out/share/pixie-vm $out/bin/pixie-vm \ --prefix LD_LIBRARY_PATH : ${library-path} \ --prefix C_INCLUDE_PATH : ${include-path} \ --prefix LIBRARY_PATH : ${library-path} \ --prefix PATH : ${bin-path} + cat > $out/bin/pxi <<EOF + #!$shell + >&2 echo "[\$\$] WARNING: 'pxi' is a deprecated alias for 'pixie-vm', please update your scripts." + exec $out/bin/pixie-vm "\$@" + EOF + chmod +x $out/bin/pxi ''; meta = { description = "A clojure-like lisp, built with the pypy vm toolkit"; diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index 1aea9f440391..34b471131938 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pixie ]; patches = [ ./make-paths-configurable.patch ]; configurePhase = '' - pixiePath="${pixie}/bin/pxi" \ + pixiePath="${pixie}/bin/pixie-vm" \ basePath="$out/share/dust" \ substituteAll dust.in dust chmod +x dust |