diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
| commit | b24d64b3b1ef897f07cd072a88a9881cb330aa7f (patch) | |
| tree | a87bb2eed9af3ef1efd51dd65221d91f0c949041 /nixpkgs/pkgs/development/libraries/lemon-graph | |
| parent | 73338df7473bb3810e70a16b8b0cba4f0f606f2b (diff) | |
| parent | fa15b53dbea5028db38d6e09b4cef6eba42aeebb (diff) | |
| download | nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.gz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.bz2 nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.lz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.xz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.zst nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/lemon-graph')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/lemon-graph/default.nix | 5 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/lemon-graph/remove-register.patch | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/lemon-graph/default.nix b/nixpkgs/pkgs/development/libraries/lemon-graph/default.nix index 81c21bb68d69..ae071a727133 100644 --- a/nixpkgs/pkgs/development/libraries/lemon-graph/default.nix +++ b/nixpkgs/pkgs/development/libraries/lemon-graph/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { # error: no viable conversion from ... doCheck = !stdenv.isDarwin; + patches = [ + # error: ISO C++17 does not allow 'register' storage class specifier + ./remove-register.patch + ]; + meta = with lib; { homepage = "https://lemon.cs.elte.hu/trac/lemon"; description = "Efficient library for combinatorial optimization tasks on graphs and networks"; diff --git a/nixpkgs/pkgs/development/libraries/lemon-graph/remove-register.patch b/nixpkgs/pkgs/development/libraries/lemon-graph/remove-register.patch new file mode 100644 index 000000000000..002e832035bf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/lemon-graph/remove-register.patch @@ -0,0 +1,15 @@ +diff --git a/lemon/random.h b/lemon/random.h +index 8de74ede8a..f9861f3916 100644 +--- a/lemon/random.h ++++ b/lemon/random.h +@@ -249,8 +249,8 @@ namespace lemon { + + current = state + length; + +- register Word *curr = state + length - 1; +- register long num; ++ Word *curr = state + length - 1; ++ long num; + + num = length - shift; + while (num--) { |