diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 186826e6f7d..918605366fe 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cfdc1f70e0..575b50b1c35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30334,7 +30334,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 { };