diff options
author | Robert Scott <code@humanleg.org.uk> | 2020-09-28 21:24:49 +0100 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-09-29 05:47:46 -0700 |
commit | 9f65c524bb6652e30ee35edca2d15354ef92b6d5 (patch) | |
tree | f8bd7b4cb44bfd1ff18c62479d658317c7560907 /pkgs/development/tools/minizinc | |
parent | 5b65d3e7bc5024f85d479f0d8fe2c8cdbf6f0c88 (diff) |
minizinc: fix build against bison 3.7
fixed in upstream development branch enable for darwin
Diffstat (limited to 'pkgs/development/tools/minizinc')
-rw-r--r-- | pkgs/development/tools/minizinc/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 308343c1ec6fe..8cd4fc9f7f4b7 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -22,6 +22,16 @@ stdenv.mkDerivation { url = "https://github.com/MiniZinc/libminizinc/commit/d3136f6f198d3081943c17ac6890dbe14a81d112.diff"; sha256 = "1f4wxn9422ndgq6dd0vqdxm2313srm7gn9nh82aas2xijdxlmz2c"; }) + (fetchpatch { + name = "bison-3.7-compat-1.patch"; + url = "https://github.com/MiniZinc/libminizinc/commit/8d4dcf302e78231f7c2665150e8178cacd06f91c.patch"; + sha256 = "1wgciyrqijv7b4wqha94is5skji8j7b9wq6fkdsnsimfd3xpxhqw"; + }) + (fetchpatch { + name = "bison-3.7-compat-2.patch"; + url = "https://github.com/MiniZinc/libminizinc/commit/952ffda0bd23dc21f83d3e3f080ea5b3a414e8e0.patch"; + sha256 = "0cnsfqw0hwm7rmazqnb99725rm2vdwab75vdpr5x5l3kjwsn76rj"; + }) ]; meta = with stdenv.lib; { @@ -37,7 +47,7 @@ stdenv.mkDerivation { ''; license = licenses.mpl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.sheenobu ]; }; } |