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

dmg2img: fix build against openssl 1.1

Browse Source
This commit is contained in:
Jörg Thalheim 2020-05-03 13:33:05 +01:00
parent 9a051ffe6e
commit 3f58552956
No known key found for this signature in database
GPG Key ID: 003F2096411B5F92
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/misc/dmg2img/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, bzip2, openssl }:
{ stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }:
stdenv.mkDerivation rec {
name = "dmg2img-1.6.7";
@ -8,11 +8,20 @@ stdenv.mkDerivation rec {
sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2";
};
buildInputs = [zlib bzip2 openssl];
buildInputs = [ zlib bzip2 openssl ];
patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/dmg2img/openssl-1.1.diff";
sha256 = "076sz69hf3ryylplg025vl8sj991cb81g3yazsmrf8anrd7ffmxx";
})
];
patchFlags = [ "-p0" ];
installPhase = ''
mkdir -p $out/bin
cp dmg2img $out/bin
install -D dmg2img $out/bin/dmg2img
install -D vfdecrypt $out/bin/vfdecrypt
'';
meta = {

4
pkgs/top-level/all-packages.nix
View File

@ -2929,9 +2929,7 @@ in
dmd = callPackage ../development/compilers/dmd { };
dmg2img = callPackage ../tools/misc/dmg2img {
openssl = openssl_1_0_2;
};
dmg2img = callPackage ../tools/misc/dmg2img { };
docbook2odf = callPackage ../tools/typesetting/docbook2odf { };