pyrox.dev
ebusd: remove gcc patch, update cmake patch and change dir usage
+5
-7
pkgs/by-name/eb/ebusd/package.nix
+5
-7
pkgs/by-name/eb/ebusd/package.nix
···
41
41
42
42
patches = [
43
43
./patches/ebusd-cmake.patch
44
-
# Upstream patch for gcc-13 copmpatibility:
45
-
(fetchpatch {
46
-
name = "gcc-13.patch";
47
-
url = "https://github.com/john30/ebusd/commit/3384f3780087bd6b94d46bf18cdad18201ad516c.patch";
48
-
hash = "sha256-+wZDHjGaIhBCqhy2zmIE8Ko3uAiw8kfKx64etCqRQjM=";
49
-
})
50
44
];
45
+
46
+
preInstall = ''
47
+
mkdir -p $out/usr/bin
48
+
'';
51
49
52
50
cmakeFlags = [
53
51
"-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc"
···
56
54
];
57
55
58
56
postInstall = ''
59
-
mv $out/usr/bin $out
57
+
rmdir $out/usr/bin
60
58
rmdir $out/usr
61
59
'';
62
60
+2
-2
pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch
+2
-2
pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch
···
1
1
--- a/CMakeLists.txt
2
2
+++ b/CMakeLists.txt
3
-
@@ -184,16 +184,11 @@
3
+
@@ -179,16 +179,11 @@
4
4
add_subdirectory(src/lib/knx)
5
5
add_subdirectory(src/tools)
6
-
6
+
7
7
-if(EXISTS "${ROOT}/etc/debian_version")
8
8
- install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/default/ebusd DESTINATION /etc/default/)
9
9
- install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/init.d/ebusd DESTINATION /etc/init.d/)