Skip to content

Commit

Permalink
pixie: name binary pixie and allow macOS build
Browse files Browse the repository at this point in the history
- Pixie supports macOS. Nix package should too.
- Updated executable name as discussed in pixie-lang/pixie/issues/455.

closes #33771
  • Loading branch information
alekcz authored and bendlas committed Jan 19, 2018
1 parent 287415a commit 7eb4844
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/pixie/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,23 @@ 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/pixie-vm \
makeWrapper $out/share/pixie-vm $out/bin/pixie \
--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 "\$@"
>&2 echo "[\$\$] WARNING: 'pxi' and 'pixie-vm' are deprecated aliases for 'pixie', please update your scripts."
exec $out/bin/pixie "\$@"
EOF
chmod +x $out/bin/pxi
'';
meta = {
description = "A clojure-like lisp, built with the pypy vm toolkit";
homepage = https://github.com/pixie-lang/pixie;
license = stdenv.lib.licenses.lgpl3;
platforms = ["x86_64-linux" "i686-linux"];
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
};
};
in build (builtins.getAttr variant variants)
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/pixie/dust.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";
homepage = src.meta.homepage;
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}

0 comments on commit 7eb4844

Please sign in to comment.