nix: fixes
This commit is contained in:
parent
b648477b91
commit
84cd315aa0
2 changed files with 7 additions and 5 deletions
|
|
@ -53,7 +53,7 @@
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
|
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
|
||||||
cmake --build build
|
cmake --build build
|
||||||
export CAELESTIA_LIB_DIR="$PWD/build/assets/cpp";
|
export CAELESTIA_LIB_DIR="$PWD/build/lib";
|
||||||
export QML2_IMPORT_PATH="$PWD/build/qml";
|
export QML2_IMPORT_PATH="$PWD/build/qml";
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@
|
||||||
name = "caelestia-assets";
|
name = "caelestia-assets";
|
||||||
src = ./../assets/cpp;
|
src = ./../assets/cpp;
|
||||||
|
|
||||||
nativeBuildInputs = [cmake pkg-config];
|
nativeBuildInputs = [cmake ninja pkg-config];
|
||||||
buildInputs = [aubio pipewire];
|
buildInputs = [aubio pipewire];
|
||||||
|
|
||||||
cmakeFlags = [(lib.cmakeFeature "INSTALL_LIBDIR" "${placeholder "out"}/lib")];
|
cmakeFlags = [(lib.cmakeFeature "INSTALL_LIBDIR" "${placeholder "out"}/lib")];
|
||||||
|
|
@ -77,8 +77,10 @@
|
||||||
plugin = stdenv.mkDerivation {
|
plugin = stdenv.mkDerivation {
|
||||||
name = "caelestia-qml-plugin";
|
name = "caelestia-qml-plugin";
|
||||||
src = ./../plugin;
|
src = ./../plugin;
|
||||||
nativeBuildInputs = [cmake];
|
|
||||||
|
nativeBuildInputs = [cmake ninja];
|
||||||
buildInputs = [qt6.qtbase qt6.qtdeclarative];
|
buildInputs = [qt6.qtbase qt6.qtdeclarative];
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
cmakeFlags = [(lib.cmakeFeature "INSTALL_QMLDIR" qt6.qtbase.qtQmlPrefix)];
|
cmakeFlags = [(lib.cmakeFeature "INSTALL_QMLDIR" qt6.qtbase.qtQmlPrefix)];
|
||||||
};
|
};
|
||||||
|
|
@ -95,8 +97,8 @@ in
|
||||||
cmakeBuildType = "Release";
|
cmakeBuildType = "Release";
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
(lib.cmakeFeature "VERSION" version)
|
(lib.cmakeFeature "VERSION" version)
|
||||||
(lib.cmakeFeature "DONT_BUILD_PLUGIN" "ON")
|
(lib.cmakeBool "DONT_BUILD_PLUGIN" true)
|
||||||
(lib.cmakeFeature "DONT_BUILD_ASSETS" "ON")
|
(lib.cmakeBool "DONT_BUILD_ASSETS" true)
|
||||||
(lib.cmakeFeature "INSTALL_QSCONFDIR" "${placeholder "out"}/share/caelestia-shell")
|
(lib.cmakeFeature "INSTALL_QSCONFDIR" "${placeholder "out"}/share/caelestia-shell")
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue