diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-05-03 15:06:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 15:06:36 +0100 |
| commit | 9daf16bd5b2e258f7f2258d6b913d2f1e83b310f (patch) | |
| tree | 388b710b106b05d93210b8614e04aa6a012fa1bc /pkgs | |
| parent | 5fda26c3d0ac3f14d884d81482bd75325db683ea (diff) | |
| parent | 3f58552956740e1fd9589cfdd33f191e0dd9a55e (diff) | |
| download | nixlib-9daf16bd5b2e258f7f2258d6b913d2f1e83b310f.tar nixlib-9daf16bd5b2e258f7f2258d6b913d2f1e83b310f.tar.gz nixlib-9daf16bd5b2e258f7f2258d6b913d2f1e83b310f.tar.bz2 nixlib-9daf16bd5b2e258f7f2258d6b913d2f1e83b310f.tar.lz nixlib-9daf16bd5b2e258f7f2258d6b913d2f1e83b310f.tar.xz nixlib-9daf16bd5b2e258f7f2258d6b913d2f1e83b310f.tar.zst nixlib-9daf16bd5b2e258f7f2258d6b913d2f1e83b310f.zip | |
Merge pull request #86646 from Mic92/dmg2img
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/dmg2img/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index df084579b79a..267983dd432c 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -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 = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 929227916139..d1adb4e0eb27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |