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/libwnck | |
| 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/libwnck')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libwnck/2.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libwnck/default.nix | 19 |
2 files changed, 18 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libwnck/2.nix b/nixpkgs/pkgs/development/libraries/libwnck/2.nix index fd7d80574a7d..a1f54006beb5 100644 --- a/nixpkgs/pkgs/development/libraries/libwnck/2.nix +++ b/nixpkgs/pkgs/development/libraries/libwnck/2.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK diff --git a/nixpkgs/pkgs/development/libraries/libwnck/default.nix b/nixpkgs/pkgs/development/libraries/libwnck/default.nix index 9f92ed5fd459..2f535930ed03 100644 --- a/nixpkgs/pkgs/development/libraries/libwnck/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwnck/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , fetchpatch , meson +, mesonEmulatorHook , ninja , pkg-config , gtk-doc @@ -21,16 +23,25 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "40.1"; + version = "43.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AxNPoRTvP740B1qoNnj1iqLevp/O9OojwHeeKGAdZhE="; + sha256 = "kFvNuFhH1rj4hh5WswzW3GHq5n7O9M2ZSp+SWiaiwf4="; }; + patches = [ + # bamfdaemon crashes with libwnck3 43.0 + # https://bugs.launchpad.net/ubuntu/+source/libwnck3/+bug/1990263 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libwnck/-/commit/6ceb684442eb26e3bdb8a38bf52264ad55f96a7b.patch"; + sha256 = "/1wCnElCrZB7XTDW/l3dxMKZ9czGnukbGu4/aQStoXE="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -40,6 +51,8 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_412 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ |