diff options
| author | Hannes Schulze <contact@haschu.me> | 2026-04-25 23:18:50 +0200 |
|---|---|---|
| committer | Hannes Schulze <contact@haschu.me> | 2026-04-25 23:18:50 +0200 |
| commit | 77a4c25a2e5aeda0f0d1f1980eb7c85c99041c45 (patch) | |
| tree | 41fd11da0770aa1e6d22b396bf209d942b4a048b | |
| parent | 3632f61cd6d670bf86fcc133926f4f2595d35b73 (diff) | |
use system gtk4-layer-shell
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | nix/package.nix | 10 | ||||
| -rw-r--r-- | subprojects/gtk4-layer-shell.wrap | 4 |
4 files changed, 9 insertions, 23 deletions
@@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { diff --git a/meson.build b/meson.build index f1cdb9d..a5b7243 100644 --- a/meson.build +++ b/meson.build @@ -6,15 +6,11 @@ glib_dep = dependency('glib-2.0', version: '>=2.78') gio_dep = dependency('gio-2.0', version: '>=2.78') gio_unix_dep = dependency('gio-unix-2.0', version: '>=2.78') gtk_dep = dependency('gtk4', version: '>=4.12') +layershell_dep = dependency('gtk4-layer-shell-0', version: '>=1.1') json_dep = dependency('json-glib-1.0', version: '>=1.8') nm_dep = dependency('libnm', version: '>=1.44') gmp_dep = dependency('gmp', version: '>=6.3') m_dep = meson.get_compiler('c').find_library('m', required : false) -layershell_dep = dependency( - 'gtk4-layer-shell', - fallback: [ 'gtk4-layer-shell', 'gtk_layer_shell' ], - default_options: [ 'default_library=static' ], -) gvc_dep = dependency( 'gvc', fallback: [ 'gvc', 'libgvc_dep' ], diff --git a/nix/package.nix b/nix/package.nix index 3b8be8f..666cf64 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -14,6 +14,7 @@ wayland-scanner, glib, gtk4, + gtk4-layer-shell, json-glib, gmp, librsvg, @@ -25,12 +26,6 @@ brightnessctl }: let - dep-gtk4-layer-shell = fetchFromGitHub { - owner = "wmww"; - repo = "gtk4-layer-shell"; - rev = "v1.0.2"; - hash = "sha256-decjPkFkYy7kIjyozsB7BEmw33wzq1EQyIBrxO36984="; - }; dep-gvc = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; @@ -44,7 +39,6 @@ src = ./..; postUnpack = '' pushd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${dep-gtk4-layer-shell} subprojects/gtk4-layer-shell cp -R --no-preserve=mode,ownership ${dep-gvc} subprojects/gvc popd ''; @@ -55,7 +49,7 @@ ''; nativeBuildInputs = [ makeWrapper git meson ninja vala sassc pkg-config gobject-introspection wayland-scanner ]; - buildInputs = [ glib gtk4 json-glib gmp librsvg networkmanager wayland libpulseaudio alsa-lib upower brightnessctl ]; + buildInputs = [ glib gtk4 gtk4-layer-shell json-glib gmp librsvg networkmanager wayland libpulseaudio alsa-lib upower brightnessctl ]; meta = with lib; { homepage = "https://github.com/hannesschulze/foobar"; diff --git a/subprojects/gtk4-layer-shell.wrap b/subprojects/gtk4-layer-shell.wrap deleted file mode 100644 index 685e967..0000000 --- a/subprojects/gtk4-layer-shell.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -url = https://github.com/wmww/gtk4-layer-shell.git -revision = v1.3.0 -depth = 1 |