diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-02-06 19:33:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 19:33:59 +0000 |
| commit | 5e8ae8d5975ee93ce9bbf6c536591037cd518a66 (patch) | |
| tree | 5bf415443bd0dabec96b882e36161f816526a7e8 | |
| parent | d4df7aadf9a992b153928534499af1408da9730a (diff) | |
| parent | 9e2993e75a4c74c381706631c8a0c60940b08046 (diff) | |
| download | nixlib-5e8ae8d5975ee93ce9bbf6c536591037cd518a66.tar nixlib-5e8ae8d5975ee93ce9bbf6c536591037cd518a66.tar.gz nixlib-5e8ae8d5975ee93ce9bbf6c536591037cd518a66.tar.bz2 nixlib-5e8ae8d5975ee93ce9bbf6c536591037cd518a66.tar.lz nixlib-5e8ae8d5975ee93ce9bbf6c536591037cd518a66.tar.xz nixlib-5e8ae8d5975ee93ce9bbf6c536591037cd518a66.tar.zst nixlib-5e8ae8d5975ee93ce9bbf6c536591037cd518a66.zip | |
Merge pull request #34674 from dtzWill/feature/diff-pdf
diff-pdf: init at 2017-12-30.
| -rw-r--r-- | pkgs/applications/misc/diff-pdf/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix new file mode 100644 index 000000000000..467c2b3c2d59 --- /dev/null +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: + +let + wxInputs = + if stdenv.isDarwin then + [ wxmac darwin.apple_sdk.frameworks.Cocoa ] + else + [ wxGTK ]; +in +stdenv.mkDerivation rec { + name = "diff-pdf-${version}"; + version = "2017-12-30"; + + src = fetchFromGitHub { + owner = "vslavik"; + repo = "diff-pdf"; + rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc"; + sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig ]; + buildInputs = [ cairo poppler ] ++ wxInputs; + + preConfigure = "./bootstrap"; + + meta = with stdenv.lib; { + homepage = http://vslavik.github.io/diff-pdf; + description = "Simple tool for visually comparing two PDF files"; + license = licenses.gpl2; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7b2e96d9810..cf0e9bc4d98e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16445,6 +16445,8 @@ with pkgs; diffpdf = callPackage ../applications/misc/diffpdf { }; + diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; + mlocate = callPackage ../tools/misc/mlocate { }; mypaint = callPackage ../applications/graphics/mypaint { }; |