nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nix: fix build

Browse source
This commit is contained in:
Soramane 2025-08-28 19:48:07 +10:00
parent b5b9489dc2
commit 27f1fbab3f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -30,7 +30,6 @@
packages = forAllSystems (pkgs: rec { packages = forAllSystems (pkgs: rec {
caelestia-shell = pkgs.callPackage ./nix { caelestia-shell = pkgs.callPackage ./nix {
rev = self.rev or self.dirtyRev;
quickshell = inputs.quickshell.packages.${pkgs.system}.default.override { quickshell = inputs.quickshell.packages.${pkgs.system}.default.override {
withX11 = false; withX11 = false;
withI3 = false; withI3 = false;

7
nix/default.nix
View file

@ -1,5 +1,4 @@
{ {
rev,
lib, lib,
stdenv, stdenv,
makeWrapper, makeWrapper,
@ -36,6 +35,8 @@
withCli ? false, withCli ? false,
extraRuntimeDeps ? [], extraRuntimeDeps ? [],
}: let }: let
version = "1.0.0";
runtimeDeps = runtimeDeps =
[ [
fish fish
@ -64,8 +65,8 @@
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit version;
pname = "caelestia-shell"; pname = "caelestia-shell";
version = "${rev}";
src = ./..; src = ./..;
nativeBuildInputs = [cmake ninja pkg-config makeWrapper qt6.wrapQtAppsHook]; nativeBuildInputs = [cmake ninja pkg-config makeWrapper qt6.wrapQtAppsHook];
@ -74,7 +75,7 @@ in
cmakeBuildType = "Release"; cmakeBuildType = "Release";
cmakeFlags = [ cmakeFlags = [
(lib.cmakeFeature "VERSION" rev) (lib.cmakeFeature "VERSION" version)
(lib.cmakeFeature "INSTALL_LIBDIR" "${placeholder "out"}/lib") (lib.cmakeFeature "INSTALL_LIBDIR" "${placeholder "out"}/lib")
(lib.cmakeFeature "INSTALL_QMLDIR" qt6.qtbase.qtQmlPrefix) (lib.cmakeFeature "INSTALL_QMLDIR" qt6.qtbase.qtQmlPrefix)
(lib.cmakeFeature "INSTALL_QSCONFDIR" "${placeholder "out"}/share/caelestia-shell") (lib.cmakeFeature "INSTALL_QSCONFDIR" "${placeholder "out"}/share/caelestia-shell")