diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2019-03-10 15:32:44 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-07-29 21:25:14 +0200 |
| commit | 028fee98d334a0f4d7ad354213be512dd00057dd (patch) | |
| tree | 0ce8dabd634cef64a2af1e37af175b0a826c4b93 /pkgs/tools/backup | |
| parent | d9e72321c7e13f484a4ee368fc26effa6c7b78e7 (diff) | |
| download | nixpkgs-028fee98d334a0f4d7ad354213be512dd00057dd.tar nixpkgs-028fee98d334a0f4d7ad354213be512dd00057dd.tar.gz nixpkgs-028fee98d334a0f4d7ad354213be512dd00057dd.tar.bz2 nixpkgs-028fee98d334a0f4d7ad354213be512dd00057dd.tar.lz nixpkgs-028fee98d334a0f4d7ad354213be512dd00057dd.tar.xz nixpkgs-028fee98d334a0f4d7ad354213be512dd00057dd.tar.zst nixpkgs-028fee98d334a0f4d7ad354213be512dd00057dd.zip | |
partimage: apply openssl1.1 patch
The (new) patch also incorporates the now removed no-SSLv2 patch so it has been dropped.
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/partimage/default.nix | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index a2e962d7f85..4a18deeb57c 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -1,4 +1,13 @@ -{stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang +{stdenv +, fetchurl +, fetchpatch +, bzip2 +, zlib +, newt +, openssl +, pkgconfig +, slang +, autoreconfHook }: stdenv.mkDerivation { name = "partimage-0.6.9"; @@ -8,20 +17,19 @@ stdenv.mkDerivation { url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; + configureFlags = [ "--with-ssl-headers=${openssl.dev}/include/openssl" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [bzip2 zlib newt newt openssl slang - # automake autoconf libtool gettext - ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ bzip2 zlib newt newt openssl slang ]; patches = [ ./gentoos-zlib.patch (fetchpatch { - name = "no-SSLv2.patch"; - url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk" - + "/use-SSLv3-by-default.patch?h=packages/partimage&id=7e95d1c6614e"; - sha256 = "17dfqwvwnkinz8vs0l3bjjbmfx3a7y8nv3wn67gjsqpmggcpdnd6"; + name = "openssl-1.1.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-block/partimage/files/" + + "partimage-0.6.9-openssl-1.1-compatibility.patch?id=3fe8e9910002b6523d995512a646b063565d0447"; + sha256 = "1hs0krxrncxq1w36bhad02yk8yx71zcfs35cw87c82sl2sfwasjg"; }) ]; |