pkgs/development/compilers: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }:
|
||||
{ lib, stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }:
|
||||
|
||||
let
|
||||
common = javaVersion:
|
||||
@@ -111,7 +111,7 @@ let
|
||||
"11" = "$out/lib/jli:$out/lib/server:$out/lib";
|
||||
}.${javaVersion}
|
||||
}:${
|
||||
stdenv.lib.makeLibraryPath [
|
||||
lib.makeLibraryPath [
|
||||
stdenv.cc.cc.lib # libstdc++.so.6
|
||||
zlib # libz.so.1
|
||||
]}"
|
||||
@@ -128,7 +128,7 @@ let
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
echo ${stdenv.lib.escapeShellArg ''
|
||||
echo ${lib.escapeShellArg ''
|
||||
public class HelloWorld {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello World");
|
||||
@@ -151,7 +151,7 @@ let
|
||||
|
||||
passthru.home = graalvmXXX-ce;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.graalvm.org/";
|
||||
description = "High-Performance Polyglot VM";
|
||||
license = with licenses; [ upl gpl2Classpath bsd3 ];
|
||||
|
||||
@@ -270,7 +270,7 @@ in rec {
|
||||
--prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \
|
||||
--set FINDBUGS_HOME ${findbugs}
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/graalvm/mx";
|
||||
description = "Command-line tool used for the development of Graal projects";
|
||||
license = licenses.gpl2;
|
||||
@@ -527,7 +527,7 @@ in rec {
|
||||
enableParallelBuilding = true;
|
||||
passthru.home = graalvm8;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/oracle/graal";
|
||||
description = "High-Performance Polyglot VM";
|
||||
license = licenses.gpl2;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
|
||||
{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
|
||||
|
||||
let
|
||||
common = javaVersion:
|
||||
@@ -124,7 +124,7 @@ let
|
||||
"11" = "$out/lib/jli:$out/lib/server:$out/lib";
|
||||
}.${javaVersion}
|
||||
}:${
|
||||
stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
|
||||
lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
|
||||
glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
|
||||
|
||||
for f in $(find $out -type f -perm -0100); do
|
||||
@@ -141,7 +141,7 @@ let
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
echo ${stdenv.lib.escapeShellArg ''
|
||||
echo ${lib.escapeShellArg ''
|
||||
public class HelloWorld {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello World");
|
||||
@@ -167,7 +167,7 @@ let
|
||||
|
||||
passthru.home = graalvmXXX-ee;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.graalvm.org/";
|
||||
description = "High-Performance Polyglot VM";
|
||||
license = licenses.unfree;
|
||||
|
||||
Reference in New Issue
Block a user