Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4120419e10d1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 84f862ed9142
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 5, 2020

  1. satallax: Fix build with GCC9

    @JohnAZoidberg
    JohnAZoidberg committed Mar 5, 2020
    Copy the full SHA
    bc56175 View commit details

Commits on Mar 8, 2020

  1. Merge pull request #81796 from JohnAZoidberg/satallax-gcc9 

    satallax: Fix build with GCC9
    @Ma27
    Ma27 authored Mar 8, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    84f862e View commit details
Showing with 26 additions and 0 deletions.
  1. +5 −0 pkgs/applications/science/logic/satallax/default.nix
  2. +21 −0 pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch
5 changes: 5 additions & 0 deletions pkgs/applications/science/logic/satallax/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
};

patches = [
# GCC9 doesn't allow default value in friend declaration.
./fix-declaration-gcc9.patch
];

preConfigure = ''
mkdir fake-tools
echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname
21 changes: 21 additions & 0 deletions pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git i/minisat/core/SolverTypes.h w/minisat/core/SolverTypes.h
--- i/minisat/core/SolverTypes.h
+++ w/minisat/core/SolverTypes.h
@@ -47,7 +47,7 @@ struct Lit {
int x;

// Use this as a constructor:
- friend Lit mkLit(Var var, bool sign = false);
+ friend Lit mkLit(Var var, bool sign);

bool operator == (Lit p) const { return x == p.x; }
bool operator != (Lit p) const { return x != p.x; }
@@ -55,7 +55,7 @@ struct Lit {
};


-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
+inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; }
inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
inline bool sign (Lit p) { return p.x & 1; }