diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2020-12-13 16:23:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-13 16:23:14 +0100 |
| commit | dbfbbabc96646371b259c8e33beb89fde3f1b892 (patch) | |
| tree | 43e7f5620d00d0bbf6464059d870e2d8a471a1c7 /pkgs | |
| parent | 8b7057ca00bfe791e9b6363277823c62cbffb164 (diff) | |
| parent | 9d22a8b60c00523c8d66db7d21627baca87d44ea (diff) | |
Merge pull request #106428 from iamdenchik/IPMIView-2.18.0
IPMIView: 2.17.0 -> 2.18.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/ipmiview/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 851022899d9f..f0e2b70d939a 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "IPMIView"; - version = "2.17.0"; - buildVersion = "200505"; + version = "2.18.0"; + buildVersion = "201007"; src = fetchurl { url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; - sha256 = "0ba0694krj2q77zwdn22v2qzjdy52a7ryhgc3m51s7p17ahigz97"; + sha256 = "10cv63yhh81gjxahsg4y3zp4mjivc217m4z1vcpwvvnds46c65h8"; }; nativeBuildInputs = [ patchelf makeWrapper ]; @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { '' patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so - patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so - patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM_v11_64.so patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary} ''; @@ -56,7 +54,7 @@ stdenv.mkDerivation rec { # WORK_DIR: unfortunately the ikvm related binaries are loaded from # and user configuration is written to files in the CWD makeWrapper $out/jre/bin/java $out/bin/IPMIView \ - --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig ]}" \ + --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \ --prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \ --add-flags "-jar $out/IPMIView20.jar" \ --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview |