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

Merge pull request #203170 from jiegec/pari

Browse Source 
pari: unbreak on aarch64-darwin
This commit is contained in:
Mauricio Collares 2022-11-27 15:15:19 -03:00 committed by GitHub
commit dad9d4f76e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/science/math/pari/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
"--with-gmp=${lib.getDev gmp}" "--with-gmp=${lib.getDev gmp}"
"--with-readline=${lib.getDev readline}" "--with-readline=${lib.getDev readline}"
] ]
++ lib.optional stdenv.isDarwin "--host=x86_64-darwin" ++ lib.optional stdenv.isDarwin "--host=${stdenv.system}"
++ lib.optional withThread "--mt=pthread"; ++ lib.optional withThread "--mt=pthread";
preConfigure = '' preConfigure = ''
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
''; '';
postConfigure = lib.optionalString stdenv.isDarwin '' postConfigure = lib.optionalString stdenv.isDarwin ''
echo 'echo x86_64-darwin' > config/arch-osname echo 'echo ${stdenv.system}' > config/arch-osname
''; '';
makeFlags = [ "all" ]; makeFlags = [ "all" ];
@ -83,7 +83,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ ertes ] ++ teams.sage.members; maintainers = with maintainers; [ ertes ] ++ teams.sage.members;
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
broken = stdenv.isDarwin && stdenv.isAarch64;
mainProgram = "gp"; mainProgram = "gp";
}; };
} }