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

Commits on Mar 25, 2019

  1. libndctl: put which in nativeBuildInputs

    @illegalprime
    illegalprime committed Mar 25, 2019
    Copy the full SHA
    c3c9541 View commit details

Commits on Mar 26, 2019

  1. Merge pull request #58047 from illegalprime/libndctl-cross 

    libndctl: use buildPackages.which
    @matthewbauer
    matthewbauer authored Mar 26, 2019
    Copy the full SHA
    1ca86b4 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/libraries/libndctl/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libndctl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs =
[ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt
which
];

buildInputs =
@@ -31,7 +32,6 @@ stdenv.mkDerivation rec {

patchPhase = ''
patchShebangs test
substituteInPlace configure.ac --replace "which" "${which}/bin/which"
substituteInPlace git-version --replace /bin/bash ${stdenv.shell}
substituteInPlace git-version-gen --replace /bin/sh ${stdenv.shell}