Unverified Commit 2f1aa3e8 authored by Stanisław Pitucha's avatar Stanisław Pitucha Committed by GitHub
Browse files

Merge pull request #196348 from viraptor/darwin-applgrid 

applgrid: fix darwin build
parents 65325ce8 66d7d0cb

pkgs/development/libraries/physics/applgrid/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };