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

Commits on Apr 4, 2020

  1. neopg: fix build 

    It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.

Also move cmake and gettext to nativeBuildInputs.
    @jtojnar
    jtojnar committed Apr 4, 2020
    Copy the full SHA
    df28c41 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/tools/security/neopg/default.nix
6 changes: 3 additions & 3 deletions pkgs/tools/security/neopg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
, curl
, gettext
, pkgconfig
, libusb
, libusb1
, gnutls }:

stdenv.mkDerivation rec {
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ cmake gettext pkgconfig ];

buildInputs = [ cmake sqlite botan2 boost curl gettext libusb gnutls ];
buildInputs = [ sqlite botan2 boost curl libusb1 gnutls ];

doCheck = true;
checkTarget = "test";