diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2021-01-26 16:24:41 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 16:24:41 -0600 |
| commit | 0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6 (patch) | |
| tree | f99b33906ce1ef4ec91eeff358e65954bde1d21a /pkgs/development/libraries/poppler | |
| parent | a3b529a4606779b8351cde31f9877496cc188f18 (diff) | |
| parent | 13e3ec0d58a510742bb12f26d7c451ca4c94ce25 (diff) | |
| download | nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar.gz nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar.bz2 nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar.lz nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar.xz nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.tar.zst nixpkgs-0e418a1a18e14b0c6bc62554c0f4c4eff2e9d4e6.zip | |
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
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 f75c8c1474f..f3fae283e87 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") |