diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2017-04-11 03:22:32 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2017-04-11 03:22:32 -0500 |
commit | bb2eb5b0e8d18424e87918819c9291f3b697e92f (patch) | |
tree | 94d6ee07a4126706632f39a5f93d37ab67cd3b67 /pkgs | |
parent | f1fdc988844926f90c855f55b66955d61034569a (diff) | |
download | nixlib-bb2eb5b0e8d18424e87918819c9291f3b697e92f.tar nixlib-bb2eb5b0e8d18424e87918819c9291f3b697e92f.tar.gz nixlib-bb2eb5b0e8d18424e87918819c9291f3b697e92f.tar.bz2 nixlib-bb2eb5b0e8d18424e87918819c9291f3b697e92f.tar.lz nixlib-bb2eb5b0e8d18424e87918819c9291f3b697e92f.tar.xz nixlib-bb2eb5b0e8d18424e87918819c9291f3b697e92f.tar.zst nixlib-bb2eb5b0e8d18424e87918819c9291f3b697e92f.zip |
ibtool: use xib2nib src
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/ibtool/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/tools/ibtool/nsplist.nix | 14 | ||||
-rw-r--r-- | pkgs/development/tools/ibtool/plist-cpp.nix | 14 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/ibtool/default.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 51 insertions, 21 deletions
diff --git a/pkgs/development/tools/ibtool/default.nix b/pkgs/development/tools/ibtool/default.nix new file mode 100644 index 000000000000..17b9a77a7a18 --- /dev/null +++ b/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)" ]; +} diff --git a/pkgs/development/tools/ibtool/nsplist.nix b/pkgs/development/tools/ibtool/nsplist.nix new file mode 100644 index 000000000000..557cb5b3bd58 --- /dev/null +++ b/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 ]; +} diff --git a/pkgs/development/tools/ibtool/plist-cpp.nix b/pkgs/development/tools/ibtool/plist-cpp.nix new file mode 100644 index 000000000000..3e15489898d7 --- /dev/null +++ b/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 ]; +} diff --git a/pkgs/os-specific/darwin/ibtool/default.nix b/pkgs/os-specific/darwin/ibtool/default.nix deleted file mode 100644 index 556426ac62d9..000000000000 --- a/pkgs/os-specific/darwin/ibtool/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30f6598f975c..9c909a49a97c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 {}; } |