svn merge ^/nixpkgs/trunk

Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337

pkgs/tools/misc/most/default.nix

@@ -26,5 +26,6 @@ stdenv.mkDerivation {
     '';
     homepage = http://www.jedsoft.org/most/index.html;
     license = "GPLv2";
+    platforms = stdenv.lib.platforms.gnu; # random choice
   };
 }

pkgs/tools/misc/usbmuxd/default.nix

@@ -1,17 +1,22 @@
 { stdenv, fetchurl, cmake, libplist, libusb1, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "usbmuxd-1.0.5";
+  name = "usbmuxd-1.0.7";
 
   src = fetchurl {
     url = "http://marcansoft.com/uploads/usbmuxd/${name}.tar.bz2";
-    sha256 = "130h5hk2qhki5xflcindx0prrgm5h7aqhbygrpasvr6030k6bkiv";
+    sha256 = "09swwr6x46qxmwylrylnyqh4pznr0swla9gijggwxxw8dw82r840";
   };
 
-  buildInputs = [ cmake pkgconfig ];
+  buildNativeInputs = [ cmake pkgconfig ];
   propagatedBuildInputs = [ libusb1 libplist ];
 
-  patchPhase = "sed -e 's,/lib/udev,lib/udev,' -i udev/CMakeLists.txt";
+  patchPhase =
+    ''
+    sed -e 's,/lib/udev,lib/udev,' -i udev/CMakeLists.txt
+    sed -e 's,/bin/echo,echo,g' -i Modules/describe.sh
+    '';
+
 
   cmakeFlags = ''-DLIB_SUFFIX='';
   meta = {
@@ -21,7 +26,7 @@ stdenv.mkDerivation rec {
       usbmuxd: USB Multiplex Daemon. This bit of software is in charge of
       talking to your iPhone or iPod Touch over USB and coordinating access to
       its services by other applications.'';
-    inherit (libusb1.meta) platforms;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }