about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorDan Peebles <thetypesaretoobig@gmail.com>2015-02-08 00:12:16 -0500
committerDan Peebles <thetypesaretoobig@gmail.com>2015-02-08 00:15:54 -0500
commite9e7bfa6ac63c814615b062258142ab673b53221 (patch)
tree83e1da2582bd6395b2543c0fddba83e89259178a /pkgs
parent42a6ac52093955f761fb5577420a4b413647b142 (diff)
downloadnixlib-e9e7bfa6ac63c814615b062258142ab673b53221.tar
nixlib-e9e7bfa6ac63c814615b062258142ab673b53221.tar.gz
nixlib-e9e7bfa6ac63c814615b062258142ab673b53221.tar.bz2
nixlib-e9e7bfa6ac63c814615b062258142ab673b53221.tar.lz
nixlib-e9e7bfa6ac63c814615b062258142ab673b53221.tar.xz
nixlib-e9e7bfa6ac63c814615b062258142ab673b53221.tar.zst
nixlib-e9e7bfa6ac63c814615b062258142ab673b53221.zip
Move and restructure objconv a bit
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/misc/objconv/default.nix16
-rw-r--r--pkgs/top-level/all-packages.nix6
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix
new file mode 100644
index 000000000000..154d66705d21
--- /dev/null
+++ b/pkgs/development/tools/misc/objconv/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "objconv-1.0";
+
+  src = fetchFromGitHub {
+    owner  = "vertis";
+    repo   = "objconv";
+    rev    = "01da9219e684360fd04011599805ee3e699bae96";
+    sha256 = "1by2bbrampwv0qy8vn4hhs49rykczyj7q8g373ym38da3c95bym2";
+  };
+
+  buildPhase = "c++ -o objconv -O2 src/*.cpp";
+
+  installPhase = "mkdir -p $out/bin && mv objconv $out/bin";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 498e85223028..72382fae5ea0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2058,6 +2058,8 @@ let
 
   obexftp = callPackage ../tools/bluetooth/obexftp { };
 
+  objconv = callPackage ../development/tools/misc/objconv {};
+
   obnam = callPackage ../tools/backup/obnam { };
 
   ocz-toolbox = callPackage ../os-specific/linux/ocz-toolbox { };
@@ -8428,6 +8430,10 @@ let
 
     cmdline_sdk   = cmdline.sdk;
     cmdline_tools = cmdline.tools;
+
+    apple_sdk = callPackage ../os-specific/darwin/apple-sdk {};
+
+    libobjc = apple-source-releases.objc4;
   };
 
   devicemapper = lvm2;