diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix
index bee5a71333a..c5f982c955c 100644
--- a/pkgs/tools/archivers/rpmextract/default.nix
+++ b/pkgs/tools/archivers/rpmextract/default.nix
@@ -3,9 +3,7 @@
 stdenv.mkDerivation rec {
   name = "rpmextract";
 
-  builder = builtins.toFile "builder.sh" ''
-    source $stdenv/setup
-
+  buildCommand = ''
     install -Dm755 $script $out/bin/rpmextract
   '';
     
diff --git a/pkgs/tools/archivers/rpmextract/rpmextract.sh b/pkgs/tools/archivers/rpmextract/rpmextract.sh
index b910a992606..04f57f6e604 100644
--- a/pkgs/tools/archivers/rpmextract/rpmextract.sh
+++ b/pkgs/tools/archivers/rpmextract/rpmextract.sh
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/sh -e
 
 if [ "$1" = "" ]; then
-  echo "usage: rpmextract package_name" 1>&2
+  echo "usage: rpmextract package_name..." 1>&2
   exit 1
 fi
 
-@rpm@/bin/rpm2cpio "$1" | @cpio@/bin/cpio -idv
+for i in "$@"; do
+  @rpm@/bin/rpm2cpio "$i" | @cpio@/bin/cpio -idv
+done