mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 13:40:28 +03:00
domoticz: fix build on GCC 14, Boost 1.87
This commit is contained in:
parent
8cf288aea9
commit
b604498235
1 changed files with 12 additions and 2 deletions
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
makeWrapper,
|
||||
cmake,
|
||||
python3,
|
||||
|
@ -17,6 +18,7 @@
|
|||
git,
|
||||
libusb-compat-0_1,
|
||||
cereal,
|
||||
minizip,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -28,9 +30,16 @@ stdenv.mkDerivation rec {
|
|||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Boost 1.87 compatibility, remove once upgraded to 2025.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/domoticz/domoticz/commit/5d0db89bbd120ed5dc05b4ff8c136f14a42f0cd3.patch";
|
||||
hash = "sha256-FPe83yJKJEgnY3kABy9CTRe1CBh42dPG1ZWCUE5PO8E=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
python3
|
||||
|
@ -44,6 +53,7 @@ stdenv.mkDerivation rec {
|
|||
git
|
||||
libusb-compat-0_1
|
||||
cereal
|
||||
minizip
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -60,7 +70,7 @@ stdenv.mkDerivation rec {
|
|||
"-DUSE_BUILTIN_ZLIB=false"
|
||||
"-DUSE_OPENSSL_STATIC=false"
|
||||
"-DUSE_STATIC_BOOST=false"
|
||||
"-DUSE_BUILTIN_MINIZIP=true"
|
||||
"-DUSE_BUILTIN_MINIZIP=false"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue