diff-pdf: migrate to wxGTK32
This commit is contained in:
parent
a989aa4619
commit
7c45233bcb
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "diff-pdf";
|
pname = "diff-pdf";
|
||||||
version = "0.5";
|
version = "0.5";
|
||||||
|
@ -19,7 +12,8 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake pkg-config ];
|
nativeBuildInputs = [ autoconf automake pkg-config ];
|
||||||
buildInputs = [ cairo poppler ] ++ wxInputs;
|
buildInputs = [ cairo poppler wxGTK ]
|
||||||
|
++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||||
|
|
||||||
preConfigure = "./bootstrap";
|
preConfigure = "./bootstrap";
|
||||||
|
|
||||||
|
|
|
@ -30334,7 +30334,10 @@ with pkgs;
|
||||||
|
|
||||||
diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { };
|
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 { };
|
diffuse = callPackage ../applications/misc/diffuse { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue