diff options
author | Shawn8901 <shawn8901@googlemail.com> | 2023-01-26 18:31:02 +0100 |
---|---|---|
committer | Shawn8901 <shawn8901@googlemail.com> | 2023-01-26 18:31:02 +0100 |
commit | a59dda942cbe3d40c1ae424d4d8a6db715cac0d5 (patch) | |
tree | c4d7e17a260da0a29c9690de071787d3ca62b3d2 /pkgs/development/interpreters/picolisp | |
parent | aedc95590cdc13e99441684b7aca81cdbfa542ad (diff) |
treewide: remove global with lib; statements in pkgs/development
Diffstat (limited to 'pkgs/development/interpreters/picolisp')
-rw-r--r-- | pkgs/development/interpreters/picolisp/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 8e3e868fad931..b85f99a7b52d9 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }: -with lib; stdenv.mkDerivation rec { pname = "picoLisp"; @@ -9,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0l51x98bn1hh6kv40sdgp0x09pzg5i8yxbcjvm9n5bxsd6bbk5w2"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [openssl] ++ optional stdenv.is64bit jdk; + buildInputs = [openssl] ++ lib.optional stdenv.is64bit jdk; patchPhase = '' sed -i "s/which java/command -v java/g" mkAsm - ${optionalString stdenv.isAarch32 '' + ${lib.optionalString stdenv.isAarch32 '' sed -i s/-m32//g Makefile cat >>Makefile <<EOF ext.o: ext.c @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { EOF ''} ''; - sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}''; + sourceRoot = ''picoLisp/src${lib.optionalString stdenv.is64bit "64"}''; postBuild = '' cd ../src; make gate ''; @@ -49,7 +48,7 @@ stdenv.mkDerivation rec { ln -s "$out/lib/picolisp/lib/el" "$out/share/emacs/site-lisp" ''; - meta = { + meta = with lib; { # darwin: build times out broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "A simple Lisp with an integrated database"; |