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

Commits on Apr 24, 2020

  1. libcbor: Fix pkgconfig being placed correctly 

    Fixes #85932
    @arianvp
    arianvp committed Apr 24, 2020
    Copy the full SHA
    3ec47a7 View commit details

Commits on Apr 27, 2020

  1. Merge pull request #85935 from arianvp/fix-libcbor 

    libcbor: Fix pkgconfig being placed correctly
    @bhipple
    bhipple authored Apr 27, 2020
    Copy the full SHA
    d9e9e50 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 pkgs/development/libraries/libcbor/default.nix
2 changes: 2 additions & 0 deletions pkgs/development/libraries/libcbor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {

doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error

cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];

NIX_CFLAGS_COMPILE = "-fno-lto";

meta = with stdenv.lib; {