diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-04-08 14:48:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-08 14:48:21 +0200 |
| commit | 1660bcfff7f6ce192edf1ac3438796d95098c150 (patch) | |
| tree | 60be2a454da792d356ad1f606920bca9f1322dfb /pkgs/development | |
| parent | 4ab65fb80979d1983fa6bbd636cedbe833937ca9 (diff) | |
| parent | bd9f1f215588bb69755a4a283a3a0f9d0ba9de70 (diff) | |
Merge pull request #301232 from rnhmjoj/pr-podofo
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/podofo/0.10.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/podofo/default.nix | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix index 6c4356e9add9b..93c989a9c1ec6 100644 --- a/pkgs/development/libraries/podofo/0.10.x.nix +++ b/pkgs/development/libraries/podofo/0.10.x.nix @@ -53,10 +53,6 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; - postInstall = '' - moveToOutput lib "$lib" - ''; - meta = { homepage = "https://github.com/podofo/podofo"; description = "A library to work with the PDF file format"; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 1243763421c08..85651d225f424 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -24,8 +24,13 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; - postInstall = '' - moveToOutput lib "$lib" + postPatch = '' + # Use GNU directories to fix multiple outputs + failNoMatches='t yes; b no; :yes h; :no p; $ {x; /./{x;q}; q1}' + sed -ni src/podofo/CMakeLists.txt \ + -e 's/LIBDIRNAME/CMAKE_INSTALL_LIBDIR/' -e "$failNoMatches" + sed -ni src/podofo/libpodofo.pc.in \ + -e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches" ''; meta = with lib; { |