pkgs/development/interpreters: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
|
||||
{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
|
||||
pypy, libffi, libedit, libuv, boost, zlib,
|
||||
variant ? "jit", buildWithPypy ? false }:
|
||||
|
||||
@@ -23,11 +23,11 @@ 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";
|
||||
@@ -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)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, pixie, fetchFromGitHub }:
|
||||
{ lib, stdenv, pixie, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dust-0-91";
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
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 ++ stdenv.lib.platforms.darwin;
|
||||
license = lib.licenses.lgpl3;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user