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: e279676f480c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0a70128cdc54
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 5, 2020

  1. flatbuffers: fix build for musl

    @tobim @FRidh
    tobim authored and FRidh committed Jan 5, 2020
    Copy the full SHA
    0a70128 View commit details
Showing with 11 additions and 3 deletions.
  1. +11 −3 pkgs/development/libraries/flatbuffers/default.nix
14 changes: 11 additions & 3 deletions pkgs/development/libraries/flatbuffers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake }:

stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
pname = "flatbuffers";
version = "1.11.0";

@@ -34,4 +34,12 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.unix;
homepage = https://google.github.io/flatbuffers/;
};
}
} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl {
# Remove when updating to the next version.
patches = [
(fetchpatch {
url = "https://github.com/google/flatbuffers/commit/2b52494047fb6e97af03e1801b42adc7ed3fd78a.diff";
sha256 = "01k07ws0f4w7nnl8nli795wgjm4p94lxd3kva4yf7nf3pg4p8arx";
})
];
})