diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2021-01-12 05:50:23 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2021-01-25 15:56:15 -0600 |
commit | 5590e365e4775f138610b1036a75f8886921843e (patch) | |
tree | 58f7e1c67fe2fa8328d6db079c1149cd23d17ce0 /pkgs/development/libraries/poppler | |
parent | 67b7cffaec76a70db87685ba1b0019107be8272c (diff) | |
download | nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar.gz nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar.bz2 nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar.lz nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar.xz nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar.zst nixpkgs-5590e365e4775f138610b1036a75f8886921843e.zip |
qtbase: Check for wrapQtAppsHook in setupHook
Diffstat (limited to 'pkgs/development/libraries/poppler')
-rw-r--r-- | pkgs/development/libraries/poppler/0.61.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index a49bfad7ab3..9b89283972d 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { (mkFlag qt5Support "QT5") ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 3f2b8453d7f..a12f2190f27 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + dontWrapQtApps = true; + cmakeFlags = [ (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS" (mkFlag (!minimal) "GLIB") |