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

conky: remove upstreamed patch

Browse Source 
the CheckIncludeFile -> CheckIncludeFiles fix previously addressed by
our postPatch code was merged into conky here:
3a574ba88b
This commit is contained in:
Colin 2024-01-01 14:18:52 +00:00
parent 8252af0d74
commit ac80e19d8c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/conky/default.nix
View File

@ -77,10 +77,7 @@ stdenv.mkDerivation rec {
hash = "sha256-L8YSbdk+qQl17L4IRajFD/AEWRXb2w7xH9sM9qPGrQo=";
};
postPatch = ''
sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \
cmake/ConkyPlatformChecks.cmake
'' + optionalString docsSupport ''
postPatch = optionalString docsSupport ''
substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)"
cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp