dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
bicgl: fix build for x86_64-darwin
This commit is contained in:
Dmitry Kalinkin 2021-11-22 14:32:06 -05:00 committed by GitHub
commit 65ee0d2498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/science/biology/bicgl/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }: { lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu, GLUT }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bicgl"; pname = "bicgl";
@ -8,13 +8,15 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
inherit owner; inherit owner;
repo = pname; repo = pname;
rev = "61a035751c9244fcca1edf94d6566fa2a709ce90"; rev = "61a035751c9244fcca1edf94d6566fa2a709ce90";
sha256 = "0lzirdi1mf4yl8srq7vjn746sbydz7h0wjh7wy8gycy6hq04qrg4"; sha256 = "0lzirdi1mf4yl8srq7vjn746sbydz7h0wjh7wy8gycy6hq04qrg4";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libminc bicpl freeglut mesa_glu ]; buildInputs = [ libminc bicpl mesa_glu ]
++ lib.optionals stdenv.isDarwin [ GLUT ]
++ lib.optionals stdenv.isLinux [ freeglut ];
cmakeFlags = [ cmakeFlags = [
"-DLIBMINC_DIR=${libminc}/lib/cmake" "-DLIBMINC_DIR=${libminc}/lib/cmake"
@ -26,6 +28,6 @@ stdenv.mkDerivation rec {
description = "Brain Imaging Centre graphics library"; description = "Brain Imaging Centre graphics library";
maintainers = with maintainers; [ bcdarwin ]; maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.free; license = licenses.free;
}; };
} }

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

@ -15727,7 +15727,7 @@ with pkgs;
bicpl = callPackage ../development/libraries/science/biology/bicpl { }; bicpl = callPackage ../development/libraries/science/biology/bicpl { };
bicgl = callPackage ../development/libraries/science/biology/bicgl { }; bicgl = callPackage ../development/libraries/science/biology/bicgl { inherit (darwin.apple_sdk.frameworks) GLUT; };
# TODO(@Ericson2314): Build bionic libc from source # TODO(@Ericson2314): Build bionic libc from source
bionic = if stdenv.hostPlatform.useAndroidPrebuilt bionic = if stdenv.hostPlatform.useAndroidPrebuilt