summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-10-20 22:00:59 +0400
committerMichael Raskin <7c6f434c@mail.ru>2014-10-20 22:00:59 +0400
commit6b727e8d6803ac60be8322f014ded2eee9910d5b (patch)
treea59895f73e2b2b88cb2168dfd3e054381c55c0bc /pkgs/tools/misc
parentc47d41d783fb960611d50f7db1842630e28fa26d (diff)
parent307af9148b46fd4358012e6a1dd01e49c3496f26 (diff)
downloadnixlib-6b727e8d6803ac60be8322f014ded2eee9910d5b.tar
nixlib-6b727e8d6803ac60be8322f014ded2eee9910d5b.tar.gz
nixlib-6b727e8d6803ac60be8322f014ded2eee9910d5b.tar.bz2
nixlib-6b727e8d6803ac60be8322f014ded2eee9910d5b.tar.lz
nixlib-6b727e8d6803ac60be8322f014ded2eee9910d5b.tar.xz
nixlib-6b727e8d6803ac60be8322f014ded2eee9910d5b.tar.zst
nixlib-6b727e8d6803ac60be8322f014ded2eee9910d5b.zip
Merge pull request #4596 from abbradar/rpmextract
Add "rpmextract" script and use it
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/megacli/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix
index 7fd6ce966d6d..2d45bee49076 100644
--- a/pkgs/tools/misc/megacli/default.nix
+++ b/pkgs/tools/misc/megacli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rpm, cpio, ncurses, patchelf, makeWrapper, requireFile, unzip }:
+{ stdenv, rpmextract, ncurses, patchelf, makeWrapper, requireFile, unzip }:
 
 assert stdenv.system == "x86_64-linux";
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
       sha256 = "11jzvh25mlygflazd37gi05xv67im4rgq7sbs5nwgw3gxdh4xfjj";
     };
 
-  buildInputs = [rpm cpio ncurses unzip makeWrapper];
+  buildInputs = [rpmextract ncurses unzip makeWrapper];
   libPath =
     stdenv.lib.makeLibraryPath
        [ stdenv.gcc.gcc stdenv.gcc.libc ncurses ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cd $out
     unzip ${src}
-    rpm2cpio linux/MegaCli-8.07.07-1.noarch.rpm | cpio -idmv
+    rpmextract linux/MegaCli-8.07.07-1.noarch.rpm
     ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64
     wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64
     ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64