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: c2d728f19542
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 96cdfdad766f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 25, 2020

  1. mdds: fix compilation on darwin

    @SuperSandro2000
    SuperSandro2000 committed Nov 25, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    803b6b9 View commit details

Commits on Nov 26, 2020

  1. Merge pull request #104917 from SuperSandro2000/mdds-fix-darwin 

    mdds: fix compilation on darwin
    @marsam
    marsam authored Nov 26, 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
    96cdfda View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/development/libraries/mdds/default.nix
5 changes: 3 additions & 2 deletions pkgs/development/libraries/mdds/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost }:
{ stdenv, fetchurl, boost, llvmPackages }:

stdenv.mkDerivation rec {
pname = "mdds";
@@ -14,14 +14,15 @@ stdenv.mkDerivation rec {
cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"
'';

buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];

checkInputs = [ boost ];

meta = with stdenv.lib; {
inherit version;
homepage = "https://gitlab.com/mdds/mdds";
description = "A collection of multi-dimensional data structure and indexing algorithm";
platforms = platforms.all;
broken = stdenv.isDarwin;
license = licenses.mit;
};
}