From 525a6856f237add6fa07da4c19d7e7b6e5366dce Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 7 Jul 2013 18:54:33 +1000
Subject: [PATCH] otool and setfile: cleanup

---
 pkgs/development/libraries/wxGTK-2.9/default.nix            | 6 +++---
 .../tools/misc => os-specific/darwin}/otool/default.nix     | 3 ++-
 .../misc/setFile => os-specific/darwin/setfile}/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                             | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)
 rename pkgs/{development/tools/misc => os-specific/darwin}/otool/default.nix (93%)
 rename pkgs/{development/tools/misc/setFile => os-specific/darwin/setfile}/default.nix (91%)

diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
index e8a661a33892..f61c7eafd732 100644
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ b/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 = "
diff --git a/pkgs/development/tools/misc/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix
similarity index 93%
rename from pkgs/development/tools/misc/otool/default.nix
rename to pkgs/os-specific/darwin/otool/default.nix
index 21eb2b591c22..c998253d1480 100644
--- a/pkgs/development/tools/misc/otool/default.nix
+++ b/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;
 
diff --git a/pkgs/development/tools/misc/setFile/default.nix b/pkgs/os-specific/darwin/setfile/default.nix
similarity index 91%
rename from pkgs/development/tools/misc/setFile/default.nix
rename to pkgs/os-specific/darwin/setfile/default.nix
index e3fbd2cbc6da..94320c94bc0c 100644
--- a/pkgs/development/tools/misc/setFile/default.nix
+++ b/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;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44df80361af7..e51251cea6c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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 { };
 
   xcodeenv = callPackage ../development/mobile/xcodeenv { };