colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libproxy: proper solution for include-path issues 

Also move the postPatch code to a better place.
This commit is contained in:
Vladimír Čunát 2024-04-15 14:03:41 +02:00
parent 4908c48bf5
commit 3a48b90483
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/libproxy/default.nix
View File

@ -55,6 +55,19 @@ stdenv.mkDerivation (finalAttrs: {
})
];
postPatch = ''
# Fix running script that will try to install git hooks.
# Though it will not do anything since we do not keep .git/ directory.
# https://github.com/libproxy/libproxy/issues/262
chmod +x data/install-git-hook.sh
patchShebangs data/install-git-hook.sh
# Fix include-path propagation in non-static builds.
# https://github.com/libproxy/libproxy/pull/239#issuecomment-2056620246
substituteInPlace src/libproxy/meson.build \
--replace-fail "requires_private: 'gobject-2.0'" "requires: 'gobject-2.0'"
'';
nativeBuildInputs = [
gi-docgen
gobject-introspection
@ -80,14 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = !stdenv.hostPlatform.isDarwin;
postPatch = ''
# Fix running script that will try to install git hooks.
# Though it will not do anything since we do not keep .git/ directory.
# https://github.com/libproxy/libproxy/issues/262
chmod +x data/install-git-hook.sh
patchShebangs data/install-git-hook.sh
'';
postFixup = ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput "share/doc" "$devdoc"