nix: fix build
This commit is contained in:
parent
b5b9489dc2
commit
27f1fbab3f
2 changed files with 4 additions and 4 deletions
|
|
@ -30,7 +30,6 @@
|
|||
|
||||
packages = forAllSystems (pkgs: rec {
|
||||
caelestia-shell = pkgs.callPackage ./nix {
|
||||
rev = self.rev or self.dirtyRev;
|
||||
quickshell = inputs.quickshell.packages.${pkgs.system}.default.override {
|
||||
withX11 = false;
|
||||
withI3 = false;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{
|
||||
rev,
|
||||
lib,
|
||||
stdenv,
|
||||
makeWrapper,
|
||||
|
|
@ -36,6 +35,8 @@
|
|||
withCli ? false,
|
||||
extraRuntimeDeps ? [],
|
||||
}: let
|
||||
version = "1.0.0";
|
||||
|
||||
runtimeDeps =
|
||||
[
|
||||
fish
|
||||
|
|
@ -64,8 +65,8 @@
|
|||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit version;
|
||||
pname = "caelestia-shell";
|
||||
version = "${rev}";
|
||||
src = ./..;
|
||||
|
||||
nativeBuildInputs = [cmake ninja pkg-config makeWrapper qt6.wrapQtAppsHook];
|
||||
|
|
@ -74,7 +75,7 @@ in
|
|||
|
||||
cmakeBuildType = "Release";
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "VERSION" rev)
|
||||
(lib.cmakeFeature "VERSION" version)
|
||||
(lib.cmakeFeature "INSTALL_LIBDIR" "${placeholder "out"}/lib")
|
||||
(lib.cmakeFeature "INSTALL_QMLDIR" qt6.qtbase.qtQmlPrefix)
|
||||
(lib.cmakeFeature "INSTALL_QSCONFDIR" "${placeholder "out"}/share/caelestia-shell")
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue