nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 20:03:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #196348 from viraptor/darwin-applgrid

Browse Source 
applgrid: fix darwin build
This commit is contained in:
Stanisław Pitucha 2022-10-17 17:42:16 +11:00 committed by GitHub
commit 2f1aa3e807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/physics/applgrid/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:
{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib, Cocoa }:
stdenv.mkDerivation rec {
pname = "applgrid";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gfortran ];
# For some reason zlib was only needed after bump to gfortran8
buildInputs = [ hoppet lhapdf root5 zlib ];
buildInputs = [ hoppet lhapdf root5 zlib ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
patches = [
./bad_code.patch

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

@ -35869,7 +35869,9 @@ with pkgs;
apfel = callPackage ../development/libraries/physics/apfel { };
applgrid = callPackage ../development/libraries/physics/applgrid { };
applgrid = callPackage ../development/libraries/physics/applgrid {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
hoppet = callPackage ../development/libraries/physics/hoppet { };