pyrox.dev / nixpkgs
lol
fork atom

c3d: fix darwin build

Daiderd Jordan 25f74ecc c892f77e

+9 -6
unified split
+6 -5
pkgs/applications/graphics/c3d/default.nix
··· 1 - { stdenv, fetchgit, cmake, itk }: 2 3 stdenv.mkDerivation rec { 4 - _name = "c3d"; 5 - _version = "1.1.0"; 6 - name = "${_name}-${_version}"; 7 8 src = fetchgit { 9 url = "https://git.code.sf.net/p/c3d/git"; ··· 12 }; 13 14 nativeBuildInputs = [ cmake ]; 15 - buildInputs = [ itk ]; 16 17 meta = with stdenv.lib; { 18 homepage = http://www.itksnap.org/c3d;
··· 1 + { stdenv, fetchgit, cmake, itk, Cocoa }: 2 3 stdenv.mkDerivation rec { 4 + name = "${pname}-${version}"; 5 + pname = "c3d"; 6 + version = "1.1.0"; 7 8 src = fetchgit { 9 url = "https://git.code.sf.net/p/c3d/git"; ··· 12 }; 13 14 nativeBuildInputs = [ cmake ]; 15 + buildInputs = [ itk ] 16 + ++ stdenv.lib.optional stdenv.isDarwin Cocoa; 17 18 meta = with stdenv.lib; { 19 homepage = http://www.itksnap.org/c3d;
+3 -1
pkgs/top-level/all-packages.nix
··· 793 794 burpsuite = callPackage ../tools/networking/burpsuite {}; 795 796 - c3d = callPackage ../applications/graphics/c3d {}; 797 798 cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: { 799 isLibrary = false;
··· 793 794 burpsuite = callPackage ../tools/networking/burpsuite {}; 795 796 + c3d = callPackage ../applications/graphics/c3d { 797 + inherit (darwin.apple_sdk.frameworks) Cocoa; 798 + }; 799 800 cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: { 801 isLibrary = false;