ibtool: use xib2nib src

pkgs/development/tools/ibtool/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, callPackage, fetchFromGitHub, pugixml, boost }:
+
+let
+
+  NSPlist = callPackage ./nsplist.nix { };
+  PlistCpp = callPackage ./plist-cpp.nix { inherit NSPlist; };
+
+in
+
+stdenv.mkDerivation {
+  name = "xib2nib-730e177";
+
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = "xib2nib";
+    rev = "636fe783e8625bbdd7bfeaf85470ba3eb7b90359";
+    sha256 = "08fhx8rww95h1fpl1cwhd82bcqv1k51k542v4kawjf8w814g5y1c";
+  };
+
+  buildInputs = [ PlistCpp pugixml boost ];
+  makeFlags = [ "PREFIX=$(out)" ];
+}

pkgs/development/tools/ibtool/nsplist.nix

@@ -0,0 +1,14 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation {
+  name = "nsplist-713decf";
+
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = "NSPlist";
+    rev = "713decf06c1ef6c39a707bc99eb45ac9925f2b8a";
+    sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r";
+  };
+
+  buildInputs = [ cmake ];
+}

pkgs/development/tools/ibtool/plist-cpp.nix

@@ -0,0 +1,14 @@
+{ stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
+
+stdenv.mkDerivation {
+  name = "plistcpp-11615d";
+
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = "PlistCpp";
+    rev = "11615deab3369356a182dabbf5bae30574967264";
+    sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv";
+  };
+
+  buildInputs = [ cmake boost NSPlist pugixml ];
+}

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

@@ -1,20 +0,0 @@
-{ stdenv }:
-
-assert stdenv.isDarwin;
-
-stdenv.mkDerivation {
-  name = "ibtool";
-  src = "/usr/bin/ibtool";
-
-  unpackPhase = "true";
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p "$out"/bin
-    ln -s "$src" "$out"/bin
-  '';
-
-  meta = with stdenv.lib; {
-    platforms   = platforms.darwin;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -18408,5 +18408,5 @@ with pkgs;
 
   messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
 
-  ibtool = callPackage ../os-specific/darwin/ibtool {};
+  ibtool = callPackage ../development/tools/ibtool {};
 }