xib2nib: move nsplist, plistcpp to own folder

These libraries could be used by other packages so list them in
all-packages.nix as well.

3 files changed, 1 insertions, 36 deletions

diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix
index bc4bf4bb9483..5f516ee97cbe 100644
--- a/pkgs/development/tools/xib2nib/default.nix
+++ b/pkgs/development/tools/xib2nib/default.nix
@@ -1,11 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub, pugixml, boost }:
-
-let
-
-  NSPlist = callPackage ./nsplist.nix { };
-  PlistCpp = callPackage ./plist-cpp.nix { inherit NSPlist; };
-
-in
+{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }:
 
 stdenv.mkDerivation {
   name = "xib2nib-730e177";
diff --git a/pkgs/development/tools/xib2nib/nsplist.nix b/pkgs/development/tools/xib2nib/nsplist.nix
deleted file mode 100644
index 557cb5b3bd58..000000000000
--- a/pkgs/development/tools/xib2nib/nsplist.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation {
-  name = "nsplist-713decf";
-
-  src = fetchFromGitHub {
-    owner = "matthewbauer";
-    repo = "NSPlist";
-    rev = "713decf06c1ef6c39a707bc99eb45ac9925f2b8a";
-    sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r";
-  };
-
-  buildInputs = [ cmake ];
-}
diff --git a/pkgs/development/tools/xib2nib/plist-cpp.nix b/pkgs/development/tools/xib2nib/plist-cpp.nix
deleted file mode 100644
index 3e15489898d7..000000000000
--- a/pkgs/development/tools/xib2nib/plist-cpp.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ 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 ];
-}