Merge pull request #4596 from abbradar/rpmextract

Add "rpmextract" script and use it
2014-10-20 22:00:59 +04:00
parent c47d41d783 307af9148b
commit 6b727e8d68
8 changed files with 43 additions and 10 deletions
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/pkgs/servers/sql/oracle-xe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, requireFile, patchelf, rpm, cpio, libaio }:
+{ stdenv, makeWrapper, requireFile, patchelf, rpmextract, libaio }:

 assert stdenv.system == "x86_64-linux";

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

  unpackCmd = ''
    (mkdir -p "${name}" && cd "${name}" &&
-      ${rpm}/bin/rpm2cpio "$curSrc" | ${cpio}/bin/cpio -id)
+      ${rpmextract}/bin/rpmextract "$curSrc")
  '';

  buildPhase = let