diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
| commit | ded9a4b1aa68b8645271a63e9543ef56177ae642 (patch) | |
| tree | d351102a17ab05c6e263e970f43ab3b30561112e /pkgs/development/libraries/science | |
| parent | 98df4f635136e63644cb0ab646b55d60cbb444a4 (diff) | |
| parent | 5b0398dc36ce5746d8d54e04a1dfcab25939484a (diff) | |
| download | nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.gz nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.bz2 nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.lz nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.xz nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.zst nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.zip | |
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
Diffstat (limited to 'pkgs/development/libraries/science')
| -rw-r--r-- | pkgs/development/libraries/science/math/lcalc/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index e55244b2a59..51fbd9f14cb 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -69,7 +69,15 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71"; sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; }) - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch"; + sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18"; + }); + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/Makefile --replace g++ c++ + ''; installFlags = [ "DESTDIR=$(out)" |