Compare commits
1 commit
master
...
scenefx_re
Author | SHA1 | Date | |
---|---|---|---|
|
b129b516d1 |
3 changed files with 16 additions and 10 deletions
12
flake.lock
generated
12
flake.lock
generated
|
@ -3,11 +3,11 @@
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1673956053,
|
"lastModified": 1696426674,
|
||||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -18,11 +18,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1684585791,
|
"lastModified": 1709905912,
|
||||||
"narHash": "sha256-lYPboblKrchmbkGMoAcAivomiOscZCjtGxxTSCY51SM=",
|
"narHash": "sha256-TofHtnlrOBCxtSZ9nnlsTybDnQXUmQrlIleXF1RQAwQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "eea79d584eff53bf7a76aeb63f8845da6d386129",
|
"rev": "a343533bccc62400e8a9560423486a3b6c11a23b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
name = "swayfx-shell";
|
name = "swayfx-shell";
|
||||||
depsBuildBuild = with pkgs; [ pkg-config ];
|
depsBuildBuild = with pkgs; [ pkg-config ];
|
||||||
inputsFrom = [ self.packages.${system}.swayfx-unwrapped pkgs.wlroots_0_16 ];
|
inputsFrom = [ self.packages.${system}.swayfx-unwrapped pkgs.wlroots_0_17 ];
|
||||||
|
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = with pkgs; [
|
||||||
cmake
|
cmake
|
||||||
|
@ -65,7 +65,7 @@
|
||||||
shellHook = with pkgs; ''(
|
shellHook = with pkgs; ''(
|
||||||
mkdir -p "$PWD/subprojects"
|
mkdir -p "$PWD/subprojects"
|
||||||
cd "$PWD/subprojects"
|
cd "$PWD/subprojects"
|
||||||
cp -R --no-preserve=mode,ownership ${wlroots_0_16.src} wlroots
|
cp -R --no-preserve=mode,ownership ${wlroots_0_17.src} wlroots
|
||||||
)'';
|
)'';
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
10
meson.build
10
meson.build
|
@ -14,7 +14,7 @@ project(
|
||||||
add_project_arguments(
|
add_project_arguments(
|
||||||
[
|
[
|
||||||
'-DWLR_USE_UNSTABLE',
|
'-DWLR_USE_UNSTABLE',
|
||||||
|
'-O',
|
||||||
'-Wno-unused-parameter',
|
'-Wno-unused-parameter',
|
||||||
'-Wno-unused-result',
|
'-Wno-unused-result',
|
||||||
'-Wno-missing-braces',
|
'-Wno-missing-braces',
|
||||||
|
@ -35,8 +35,14 @@ if is_freebsd
|
||||||
add_project_arguments('-D_C11_SOURCE', language: 'c')
|
add_project_arguments('-D_C11_SOURCE', language: 'c')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Execute the scenefx subproject, if any
|
||||||
|
subproject(
|
||||||
|
'scenefx',
|
||||||
|
required: false,
|
||||||
|
)
|
||||||
|
|
||||||
# Execute the wlroots subproject, if any
|
# Execute the wlroots subproject, if any
|
||||||
wlroots_version = ['>=0.16.0', '<0.17.0']
|
wlroots_version = ['>=0.17.0', '<0.18.0']
|
||||||
subproject(
|
subproject(
|
||||||
'wlroots',
|
'wlroots',
|
||||||
default_options: ['examples=false'],
|
default_options: ['examples=false'],
|
||||||
|
|
Loading…
Add table
Reference in a new issue