Merge branch 'master' into current

pkgs/by-name/xc/xc3sprog/package.nix

@@ -3,27 +3,31 @@
   stdenv,
   fetchsvn,
   cmake,
+  pkg-config,
   libusb-compat-0_1,
-  libftdi,
+  libftdi1,
 }:
 
 # The xc3sprog project doesn't seem to make proper releases, they only put out
 # prebuilt binary subversion snapshots on sourceforge.
 
 stdenv.mkDerivation rec {
-  version = "787";
+  version = "795";
   pname = "xc3sprog";
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/xc3sprog/code/trunk";
-    sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx";
+    sha256 = "sha256-E0MGwC3gIfl60gjGaSeSPTR5jJm9r8m7Et3402lek/w=";
     rev = version;
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
   buildInputs = [
     libusb-compat-0_1
-    libftdi
+    libftdi1
   ];
 
   cmakeFlags = [