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

Commits on Jul 27, 2020

  1. multipath-tools: Fix build with multi-output lvm2 

    It was broken by commit d3a991d
(#93024).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Jul 27, 2020
    Copy the full SHA
    a3a1e27 View commit details

  2. Merge pull request #93949 from andersk/multipath-tools

    @Mic92
    Mic92 authored Jul 27, 2020
    Copy the full SHA
    7bf0f73 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/os-specific/linux/multipath-tools/default.nix
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/multipath-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
];

postPatch = ''
substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${lvm2}/include/libdevmapper.h
substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${stdenv.lib.getDev lvm2}/include/libdevmapper.h
sed -i -re '
s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
' libmultipath/defaults.h