diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/libdecor | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libdecor')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libdecor/default.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libdecor/default.nix b/nixpkgs/pkgs/development/libraries/libdecor/default.nix index 34b4e021b0f1..c3641e843f57 100644 --- a/nixpkgs/pkgs/development/libraries/libdecor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdecor/default.nix @@ -7,27 +7,31 @@ , wayland , wayland-protocols , wayland-scanner -, egl-wayland , cairo , dbus , pango -, libxkbcommon }: stdenv.mkDerivation rec { pname = "libdecor"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "jadahl"; + domain = "gitlab.freedesktop.org"; + owner = "libdecor"; repo = "libdecor"; rev = "${version}"; - sha256 = "0qdg3r7k086wzszr969s0ljlqdvfqm31zpl8p5h397bw076zr6p2"; + hash = "sha256-8b6qCqOSDDbhYwAeAaUyI71tSopTkGtCJaxZaJw1vQQ="; }; + outputs = [ "out" "dev" ]; + strictDeps = true; + mesonFlags = [ + (lib.mesonBool "demo" false) + ]; + nativeBuildInputs = [ meson ninja @@ -38,15 +42,13 @@ stdenv.mkDerivation rec { buildInputs = [ wayland wayland-protocols - egl-wayland cairo dbus pango - libxkbcommon ]; meta = with lib; { - homepage = "https://gitlab.gnome.org/jadahl/libdecor"; + homepage = "https://gitlab.freedesktop.org/libdecor/libdecor"; description = "Client-side decorations library for Wayland clients"; license = licenses.mit; platforms = platforms.linux; |