diff options
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters/pixie/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/interpreters/pixie/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/pixie/default.nix b/nixpkgs/pkgs/development/interpreters/pixie/default.nix index 9b57e153aa05..ca55eceaedbf 100644 --- a/nixpkgs/pkgs/development/interpreters/pixie/default.nix +++ b/nixpkgs/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc, +{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -23,16 +23,16 @@ let sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq"; }; libs = [ libffi libedit libuv boost.dev boost.out zlib ]; - include-path = stdenv.lib.concatStringsSep ":" + include-path = lib.concatStringsSep ":" (map (p: "${p}/include") libs); - library-path = stdenv.lib.concatStringsSep ":" + library-path = lib.concatStringsSep ":" (map (p: "${p}/lib") libs); - bin-path = stdenv.lib.concatStringsSep ":" + bin-path = lib.concatStringsSep ":" (map (p: "${p}/bin") [ gcc ]); build = {flags, target}: stdenv.mkDerivation rec { pname = "pixie"; version = "0-r${commit-count}-${variant}"; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = libs; PYTHON = if buildWithPypy then "${pypy}/pypy-c/pypy-c" @@ -85,9 +85,9 @@ let meta = { description = "A clojure-like lisp, built with the pypy vm toolkit"; homepage = "https://github.com/pixie-lang/pixie"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; - maintainers = with stdenv.lib.maintainers; [ bendlas ]; + maintainers = with lib.maintainers; [ bendlas ]; }; }; in build (builtins.getAttr variant variants) |