diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-10-08 21:37:27 +0300 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2018-10-08 21:38:14 +0300 |
| commit | fe8515de6e8ac33b94917869c668e55a8617eef8 (patch) | |
| tree | b1ce8809b33899656c733d0e6d901edf95320daf | |
| parent | 21a215059ed558b444bdd16d45dd1dc955d4ef1d (diff) | |
| download | nixlib-fe8515de6e8ac33b94917869c668e55a8617eef8.tar nixlib-fe8515de6e8ac33b94917869c668e55a8617eef8.tar.gz nixlib-fe8515de6e8ac33b94917869c668e55a8617eef8.tar.bz2 nixlib-fe8515de6e8ac33b94917869c668e55a8617eef8.tar.lz nixlib-fe8515de6e8ac33b94917869c668e55a8617eef8.tar.xz nixlib-fe8515de6e8ac33b94917869c668e55a8617eef8.tar.zst nixlib-fe8515de6e8ac33b94917869c668e55a8617eef8.zip | |
asymptote: apply upstream patch for compatibility with a newer boehmgc
As referenced in https://github.com/NixOS/nixpkgs/pull/45708#issuecomment-427840944
| -rw-r--r-- | pkgs/tools/graphics/asymptote/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a0bf0a434471..102ffae5f9d0 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{stdenv, fetchurl, fetchpatch , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz @@ -33,6 +33,15 @@ stdenv.mkDerivation { inherit (s) url sha256; }; + patches = [ + # Remove when updating from 2.47 to 2.48 + # Compatibility with BoehmGC 7.6.8 + (fetchpatch { + url = "https://github.com/vectorgraphics/asymptote/commit/38a59370dc5ac720c29e1424614a10f7384b943f.patch"; + sha256 = "0c3d11hzxxaqh24kfw9y8zvlid54kk40rx2zajx7jwl12gga05s1"; + }) + ]; + preConfigure = '' export HOME="$PWD" patchShebangs . diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22ae50b68663..5b97cd827968 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -569,7 +569,6 @@ with pkgs; asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; }; gsl = gsl_1; - boehmgc = boehmgc_766; }; atomicparsley = callPackage ../tools/video/atomicparsley { }; |