diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2017-04-12 03:28:33 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2017-04-12 03:28:33 -0500 |
commit | 1781ec934f5a815d13b768a77a4bde8798db26d3 (patch) | |
tree | 6600251654c2d45431aa8382cde0aa2b6a60f0b7 | |
parent | d697e5c8ee16c4a364aedf0d0ecde1fd9e4c9c9e (diff) | |
download | nixpkgs-1781ec934f5a815d13b768a77a4bde8798db26d3.tar nixpkgs-1781ec934f5a815d13b768a77a4bde8798db26d3.tar.gz nixpkgs-1781ec934f5a815d13b768a77a4bde8798db26d3.tar.bz2 nixpkgs-1781ec934f5a815d13b768a77a4bde8798db26d3.tar.lz nixpkgs-1781ec934f5a815d13b768a77a4bde8798db26d3.tar.xz nixpkgs-1781ec934f5a815d13b768a77a4bde8798db26d3.tar.zst nixpkgs-1781ec934f5a815d13b768a77a4bde8798db26d3.zip |
xib2nib: move nsplist, plistcpp to own folder
These libraries could be used by other packages so list them in all-packages.nix as well.
-rw-r--r-- | pkgs/development/libraries/NSPlist/default.nix (renamed from pkgs/development/tools/xib2nib/nsplist.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/PlistCpp/default.nix (renamed from pkgs/development/tools/xib2nib/plist-cpp.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/tools/xib2nib/default.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
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 {}; + } |