diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-04-15 14:03:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-04-15 14:16:14 +0200 |
| commit | 3a48b904830e8015863d604ea63debc00651f590 (patch) | |
| tree | a2a479571e5fcc3dfcbe4e2b27a096e08632078a /pkgs/development/libraries/libproxy | |
| parent | 4908c48bf52899fbfed3b383a69227c7b01b6078 (diff) | |
libproxy: proper solution for include-path issues
Also move the postPatch code to a better place.
Diffstat (limited to 'pkgs/development/libraries/libproxy')
| -rw-r--r-- | pkgs/development/libraries/libproxy/default.nix | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 6aefc31f8223b..340cfafee3271 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -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" |