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: 18ab125e83b6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f7ba4a807fef
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 5, 2019

  1. audiofile: fix build with gcc9

    @fpletz
    fpletz committed Nov 5, 2019
    Copy the full SHA
    ebe223f View commit details

  2. rubyPackages.grpc: fix build with gcc9

    @fpletz
    fpletz committed Nov 5, 2019
    Copy the full SHA
    abec42e View commit details

  3. fwupdate: fix build with gcc9

    @fpletz
    fpletz committed Nov 5, 2019
    Copy the full SHA
    f7ba4a8 View commit details
2 changes: 1 addition & 1 deletion pkgs/development/libraries/audiofile/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
};

# fix build with gcc9
NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc_s";
NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc";

patches = [
./gcc-6.patch
1 change: 1 addition & 0 deletions pkgs/development/ruby-modules/gem-config/default.nix
View file
Original file line number Diff line number Diff line change
@@ -249,6 +249,7 @@ in
"-Wno-error=class-memaccess"
"-Wno-error=ignored-qualifiers"
"-Wno-error=tautological-compare"
"-Wno-error=stringop-truncation"
];
dontBuild = false;
postPatch = ''
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/firmware/fwupdate/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
./do-not-create-sharedstatedir.patch
];

NIX_CFLAGS_COMPILE = [ "-I${gnu-efi}/include/efi" ];
NIX_CFLAGS_COMPILE = [ "-I${gnu-efi}/include/efi" "-Wno-error=address-of-packed-member" ];

# TODO: Just apply the disable to the efi subdir
hardeningDisable = [ "stackprotector" ];