diff options
| author | Travis A. Everett <travis.a.everett@gmail.com> | 2021-09-27 18:12:20 -0500 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2022-02-28 10:34:58 +0800 |
| commit | 9363ec256daa0e2b1e51ff124c27e96156d9837c (patch) | |
| tree | 0a707ac67daa773082d4baf96321c01b577a2eb8 /pkgs/tools/typesetting | |
| parent | 9783ef308da620a48a9849d977dd1dfdf7f9ba45 (diff) | |
| download | nixpkgs-9363ec256daa0e2b1e51ff124c27e96156d9837c.tar nixpkgs-9363ec256daa0e2b1e51ff124c27e96156d9837c.tar.gz nixpkgs-9363ec256daa0e2b1e51ff124c27e96156d9837c.tar.bz2 nixpkgs-9363ec256daa0e2b1e51ff124c27e96156d9837c.tar.lz nixpkgs-9363ec256daa0e2b1e51ff124c27e96156d9837c.tar.xz nixpkgs-9363ec256daa0e2b1e51ff124c27e96156d9837c.tar.zst nixpkgs-9363ec256daa0e2b1e51ff124c27e96156d9837c.zip | |
pdf2odt: use resholvePackage
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/pdf2odt/default.nix | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 6b64ee46609..f1568de60eb 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, makeWrapper, fetchFromGitHub -, bc, coreutils, file, gawk, ghostscript, gnused, imagemagick, zip }: - -let - path = lib.makeBinPath [ - bc - coreutils - file - gawk - ghostscript - gnused - imagemagick - zip - ]; - -in stdenv.mkDerivation rec { +{ lib +, resholvePackage +, fetchFromGitHub +, bc +, coreutils +, file +, gawk +, ghostscript +, gnused +, imagemagick +, zip +, bash +, findutils +}: + +resholvePackage rec { pname = "pdf2odt"; version = "20170207"; @@ -24,8 +24,6 @@ in stdenv.mkDerivation rec { sha256 = "14f9r5f0g6jzanl54jv86ls0frvspka1p9c8dy3fnriqpm584j0r"; }; - nativeBuildInputs = [ makeWrapper ]; - patches = [ ./use_mktemp.patch ]; installPhase = '' @@ -33,10 +31,24 @@ in stdenv.mkDerivation rec { install -Dm0644 README.md LICENSE -t $out/share/doc/pdf2odt ln -rs $out/bin/pdf2odt $out/bin/pdf2ods - - wrapProgram $out/bin/pdf2odt \ - --prefix PATH : ${path} ''; + solutions = { + default = { + scripts = [ "bin/pdf2odt" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + bc + file + imagemagick + gawk + gnused + ghostscript + zip + findutils + ]; + }; + }; meta = with lib; { description = "PDF to ODT format converter"; |