JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #42200 from qolii/cryptsetup_2_0_3_libressl_2_7__v2

Browse Source 
Cryptsetup: 2.0.2 -> 2.0.3. Also, add upstream libressl-2.7 patch.
This commit is contained in:
xeji 2018-07-10 00:09:55 +02:00 committed by GitHub
commit c4adce71d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/os-specific/linux/cryptsetup/default.nix
View File

@ -1,16 +1,24 @@
{ stdenv, fetchurl, devicemapper, json_c, openssl, libuuid, pkgconfig, popt
{ stdenv, fetchurl, fetchpatch, devicemapper, json_c, openssl, libuuid, pkgconfig, popt
, enablePython ? false, python2 ? null }:
assert enablePython -> python2 != null;
stdenv.mkDerivation rec {
name = "cryptsetup-2.0.2";
name = "cryptsetup-2.0.3";
src = fetchurl {
url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz";
sha256 = "15wyjfgcqjf0wy5gxnmjj8aah33csv5v6n1hv9c8sxdzygbhb0ag";
sha256 = "1m01wl8njjraz69fsk97l3nqfc32nbpr1la5s1l4mzzmq42clv2d";
};
patches = [
# NOTE: Patch to support LibreSSL-2.7. It is from upstream, and can be removed when cryptsetup is next updated.
(fetchpatch {
url = "https://gitlab.com/cryptsetup/cryptsetup/commit/5fcf430c8105fbeeb07a8cacbae84f941d2a3d55.patch";
sha256 = "1d3ycsqszq0frlv9r7kmfdfmnk4qa4b4mv25iivmayvpgc8yja7m";
})
];
NIX_LDFLAGS = "-lgcc_s";
configureFlags = [