public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/development/compilers: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-22 18:25:31 +07:00
parent bbaff89ceb
commit acc5f7b18a
320 changed files with 1660 additions and 1657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@@ -6,7 +6,7 @@
}:
{ swingSupport ? true
, stdenv
, lib, stdenv
, requireFile
, makeWrapper
, unzip
@@ -85,7 +85,7 @@ let result = stdenv.mkDerivation rec {
};
nativeBuildInputs = [ file ]
++ stdenv.lib.optional installjce unzip;
++ lib.optional installjce unzip;
buildInputs = [ makeWrapper ];
@@ -149,7 +149,7 @@ let result = stdenv.mkDerivation rec {
'';
postFixup = ''
rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
rpath+="''${rpath:+:}${lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
# set all the dynamic linkers
find $out -type f -perm -0100 \
@@ -174,7 +174,7 @@ let result = stdenv.mkDerivation rec {
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
(if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
rpath = stdenv.lib.strings.makeLibraryPath libraries;
rpath = lib.strings.makeLibraryPath libraries;
passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
@@ -184,7 +184,7 @@ let result = stdenv.mkDerivation rec {
passthru.architecture = architecture;
meta = with stdenv.lib; {
meta = with lib; {
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
};

6
pkgs/development/compilers/oraclejdk/jdk11-linux.nix
View File

@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, requireFile
, xorg
, zlib
@@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec {
'';
postFixup = ''
rpath="$out/lib/jli:$out/lib/server:$out/lib:${stdenv.lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
@@ -47,7 +47,7 @@ let result = stdenv.mkDerivation rec {
dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10
meta = with stdenv.lib; {
meta = with lib; {
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
};

6
pkgs/development/compilers/oraclejdk/jdk14-linux.nix
View File

@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, requireFile
, xorg
, zlib
@@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec {
'';
postFixup = ''
rpath="$out/lib/jli:$out/lib/server:$out/lib:${stdenv.lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
@@ -47,7 +47,7 @@ let result = stdenv.mkDerivation rec {
dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10
meta = with stdenv.lib; {
meta = with lib; {
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
};