lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #146966 from flurie/fix-bicgl-x86_64-darwin

bicgl: fix build for x86_64-darwin

authored by

Dmitry Kalinkin and committed by
GitHub
65ee0d24 d00918cc

+8 -6
+7 -5
pkgs/development/libraries/science/biology/bicgl/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }: 1 + { lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu, GLUT }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "bicgl"; ··· 8 8 9 9 src = fetchFromGitHub { 10 10 inherit owner; 11 - repo = pname; 12 - rev = "61a035751c9244fcca1edf94d6566fa2a709ce90"; 11 + repo = pname; 12 + rev = "61a035751c9244fcca1edf94d6566fa2a709ce90"; 13 13 sha256 = "0lzirdi1mf4yl8srq7vjn746sbydz7h0wjh7wy8gycy6hq04qrg4"; 14 14 }; 15 15 16 16 nativeBuildInputs = [ cmake ]; 17 - buildInputs = [ libminc bicpl freeglut mesa_glu ]; 17 + buildInputs = [ libminc bicpl mesa_glu ] 18 + ++ lib.optionals stdenv.isDarwin [ GLUT ] 19 + ++ lib.optionals stdenv.isLinux [ freeglut ]; 18 20 19 21 cmakeFlags = [ 20 22 "-DLIBMINC_DIR=${libminc}/lib/cmake" ··· 26 28 description = "Brain Imaging Centre graphics library"; 27 29 maintainers = with maintainers; [ bcdarwin ]; 28 30 platforms = platforms.unix; 29 - license = licenses.free; 31 + license = licenses.free; 30 32 }; 31 33 }
+1 -1
pkgs/top-level/all-packages.nix
··· 15727 15727 15728 15728 bicpl = callPackage ../development/libraries/science/biology/bicpl { }; 15729 15729 15730 - bicgl = callPackage ../development/libraries/science/biology/bicgl { }; 15730 + bicgl = callPackage ../development/libraries/science/biology/bicgl { inherit (darwin.apple_sdk.frameworks) GLUT; }; 15731 15731 15732 15732 # TODO(@Ericson2314): Build bionic libc from source 15733 15733 bionic = if stdenv.hostPlatform.useAndroidPrebuilt