colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #180450 from wegank/lp_solve-aarch64-darwin

Browse Source
This commit is contained in:
Sandro 2022-07-12 14:56:55 +02:00 committed by GitHub
commit 8785153a13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/science/math/lp_solve/default.nix
View File

@ -1,7 +1,12 @@
{ lib, stdenv, fetchurl, cctools, fixDarwinDylibNames }:
{ lib
, stdenv
, fetchurl
, cctools
, fixDarwinDylibNames
, autoSignDarwinBinariesHook
}:
stdenv.mkDerivation rec {
pname = "lp_solve";
version = "5.5.2.11";
@ -13,13 +18,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = lib.optionals stdenv.isDarwin [
cctools
fixDarwinDylibNames
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
autoSignDarwinBinariesHook
];
dontConfigure = true;
buildPhase = let
buildPhase =
let
ccc = if stdenv.isDarwin then "ccc.osx" else "ccc";
in ''
in
''
runHook preBuild
(cd lpsolve55 && bash -x -e ${ccc})

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

@ -6154,7 +6154,7 @@ with pkgs;
};
lp_solve = callPackage ../applications/science/math/lp_solve {
inherit (darwin) cctools;
inherit (darwin) cctools autoSignDarwinBinariesHook;
};
fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { };