public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

c3d: fix darwin build

Browse Source
This commit is contained in:
Daiderd Jordan 2017-09-08 22:45:08 +02:00
parent c892f77e37
commit 25f74ecc8b
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/graphics/c3d/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchgit, cmake, itk }: { stdenv, fetchgit, cmake, itk, Cocoa }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
_name = "c3d"; name = "${pname}-${version}";
_version = "1.1.0"; pname = "c3d";
name = "${_name}-${_version}"; version = "1.1.0";
src = fetchgit { src = fetchgit {
url = "https://git.code.sf.net/p/c3d/git"; url = "https://git.code.sf.net/p/c3d/git";
@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ itk ]; buildInputs = [ itk ]
++ stdenv.lib.optional stdenv.isDarwin Cocoa;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.itksnap.org/c3d; homepage = http://www.itksnap.org/c3d;

4
pkgs/top-level/all-packages.nix
View File

@ -793,7 +793,9 @@ with pkgs;
burpsuite = callPackage ../tools/networking/burpsuite {}; burpsuite = callPackage ../tools/networking/burpsuite {};
c3d = callPackage ../applications/graphics/c3d {}; c3d = callPackage ../applications/graphics/c3d {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: { cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: {
isLibrary = false; isLibrary = false;