diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
| commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
| tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/development/libraries/podofo | |
| parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
| parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
| download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/podofo')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/podofo/default.nix | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix b/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix index 6c4356e9add9..93c989a9c1ec 100644 --- a/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/podofo/default.nix b/nixpkgs/pkgs/development/libraries/podofo/default.nix index 1243763421c0..85651d225f42 100644 --- a/nixpkgs/pkgs/development/libraries/podofo/default.nix +++ b/nixpkgs/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; { |