xib2nib: move nsplist, plistcpp to own folder

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

4 files changed, 8 insertions, 10 deletions

diff --git a/pkgs/development/tools/xib2nib/nsplist.nix b/pkgs/development/libraries/NSPlist/default.nix
index 557cb5b3bd5..c06d98876de 100644
--- a/pkgs/development/tools/xib2nib/nsplist.nix
+++ b/pkgs/development/libraries/NSPlist/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation {
-  name = "nsplist-713decf";
+  name = "NSPlist-713decf";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
diff --git a/pkgs/development/tools/xib2nib/plist-cpp.nix b/pkgs/development/libraries/PlistCpp/default.nix
index 3e15489898d..511915be39f 100644
--- a/pkgs/development/tools/xib2nib/plist-cpp.nix
+++ b/pkgs/development/libraries/PlistCpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
 
 stdenv.mkDerivation {
-  name = "plistcpp-11615d";
+  name = "PlistCpp-11615d";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix
index bc4bf4bb948..5f516ee97cb 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7500292dcf..b981dd492d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18410,5 +18410,10 @@ with pkgs;
 
   messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
 
+  NSPlist = callPackage ../development/libraries/NSPlist {};
+
+  PlistCpp = callPackage ../development/libraries/PlistCpp {};
+
   xib2nib = callPackage ../development/tools/xib2nib {};
+
 }