summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-06-05 22:15:58 +0100
committerGitHub <noreply@github.com>2017-06-05 22:15:58 +0100
commit3a40dbced247b56dc7841c157b6fe3df7899d29e (patch)
treef644695831f06c49e47670e5e6d8c3bb27c3e3f4 /pkgs/applications
parentcf2c5f1be9443323893efd8e71345d54e67ec29f (diff)
parentc2d1cf5f3645e7a32b9b2c0eaaf2995ca7e34a14 (diff)
downloadnixlib-3a40dbced247b56dc7841c157b6fe3df7899d29e.tar
nixlib-3a40dbced247b56dc7841c157b6fe3df7899d29e.tar.gz
nixlib-3a40dbced247b56dc7841c157b6fe3df7899d29e.tar.bz2
nixlib-3a40dbced247b56dc7841c157b6fe3df7899d29e.tar.lz
nixlib-3a40dbced247b56dc7841c157b6fe3df7899d29e.tar.xz
nixlib-3a40dbced247b56dc7841c157b6fe3df7899d29e.tar.zst
nixlib-3a40dbced247b56dc7841c157b6fe3df7899d29e.zip
Merge pull request #26337 from johnramsden/ipmiview
Ipmiview: 2.11.0 -> 2.12.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/ipmiview/default.nix15
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 0afcbca4979f..11ef001ef54b 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -4,12 +4,13 @@ assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
    name = "IPMIView-${version}";
-   version = "20151223";
+   version = "2.12.0";
+   buildVersion = "160804";
 
    src = fetchurl {
-     url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_V2.11.0_bundleJRE_Linux_x64_${version}.tar.gz";
-     sha256 = "1rv9j0id7i2ipm25n60bpfdm1gj44xg2aj8rnx4s6id3ln90q121";
-   };
+    url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
+    sha256 = "787a060413451a4a5993c31805f55a221087b7199bbaf20e9fe1254e2a76db42";
+  };
 
    buildInputs = [ patchelf makeWrapper ];
 
@@ -23,12 +24,12 @@ stdenv.mkDerivation rec {
    installPhase = ''
      mkdir -p $out/bin
      cp -R . $out/
-     echo "$out/jre/bin/java -jar $out/IPMIView20.jar" > $out/bin/IPMIView
-     chmod +x $out/bin/IPMIView
+     makeWrapper $out/jre/bin/java $out/bin/IPMIView \
+       --prefix PATH : "$out/jre/bin" \
+       --add-flags "-jar $out/IPMIView20.jar"
    '';
 
    meta = with stdenv.lib; {
     license = licenses.unfree;
    };
   }
-