b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #194944 from wegank/diff-pdf-wxgtk

Browse source 
diff-pdf: migrate to wxGTK32
This commit is contained in:
Sandro 2022-10-11 02:06:48 +02:00 committed by GitHub
parent cad392ce9a 7c45233bcb
commit d62fc69707
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/misc/diff-pdf/default.nix
View file

@ -1,12 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }:
{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK, Cocoa }:
let
wxInputs =
if stdenv.isDarwin then
[ wxmac darwin.apple_sdk.frameworks.Cocoa ]
else
[ wxGTK ];
in
stdenv.mkDerivation rec {
pname = "diff-pdf";
version = "0.5";
@ -19,7 +12,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoconf automake pkg-config ];
buildInputs = [ cairo poppler ] ++ wxInputs;
buildInputs = [ cairo poppler wxGTK ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
preConfigure = "./bootstrap";

5
pkgs/top-level/all-packages.nix
View file

@ -30441,7 +30441,10 @@ with pkgs;
diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { };
diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; };
diff-pdf = callPackage ../applications/misc/diff-pdf {
wxGTK = wxGTK32;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
diffuse = callPackage ../applications/misc/diffuse { };