Merge pull request #723 from lovek323/darwin-tools

otool and setfile: cleanup

pkgs/development/libraries/wxGTK-2.9/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf, setFile
+, gstreamer, gst_plugins_base, GConf, setfile
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst_plugins_base GConf ]
     ++ optional withMesa mesa
-    ++ optional stdenv.isDarwin setFile;
+    ++ optional stdenv.isDarwin setfile;
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
   " + optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace \
       'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
-      'ac_cv_prog_SETFILE="${setFile}/bin/SetFile"'
+      'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
   '';
 
   postInstall = "

pkgs/os-specific/darwin/otool/default.nix

@@ -14,12 +14,13 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p "$out/bin"
-    cp /usr/bin/otool "$out/bin"
+    ln -s $src "$out/bin"
   '';
 
   meta = with stdenv.lib; {
     description = "Object file displaying tool";
     homepage    = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html;
+    license     = licenses.unfree;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.darwin;
 

pkgs/os-specific/darwin/setfile/default.nix

@@ -4,7 +4,7 @@
 assert stdenv.isDarwin;
 
 stdenv.mkDerivation {
-  name = "setFile";
+  name = "setfile";
 
   src = "/usr/bin/SetFile";
 
@@ -14,12 +14,13 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p "$out/bin"
-    cp $src "$out/bin"
+    ln -s $src "$out/bin"
   '';
 
   meta = with stdenv.lib; {
     description = "Set attributes of files and directories";
     homepage    = "http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/setfile.1.html";
+    license     = licenses.unfree;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.darwin;
 

pkgs/top-level/all-packages.nix

@@ -444,9 +444,9 @@ let
 
   apg = callPackage ../tools/security/apg { };
 
-  otool = callPackage ../development/tools/misc/otool { };
+  otool = callPackage ../os-specific/darwin/otool { };
 
-  setFile = callPackage ../development/tools/misc/setFile { };
+  setfile = callPackage ../os-specific/darwin/setfile { };
 
   install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };