Skip to content

Commit

Permalink
mir,mir_2_15: Drop glog dependency
Browse files Browse the repository at this point in the history
glog pkg-config file disappeared after NixOS#364543.

- mir doesn't depend on it anymore
- mir_2_15 did, and re-enabling the pkg-config file for the new glog version errored out

Upstream decided to just drop glog as a dependency, so follow suit.
  • Loading branch information
OPNA2608 committed Jan 20, 2025
1 parent b7771df commit 3c0a99e
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 2 deletions.
2 changes: 0 additions & 2 deletions pkgs/servers/mir/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
freetype,
glib,
glm,
glog,
libapparmor,
libdrm,
libepoxy,
Expand Down Expand Up @@ -112,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
freetype
glib
glm
glog
libdrm
libepoxy
libevdev
Expand Down
35 changes: 35 additions & 0 deletions pkgs/servers/mir/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ in
hash = "sha256-k+51piPQandbHdm+ioqpBrb+C7Aqi2kugchAehZ1aiU=";
})

# Always depend on epoxy
# Remove when version > 2.15.0
(fetchpatch {
name = "0003-mir-cmake-always-require-epoxy.patch";
url = "https://github.com/canonical/mir/commit/171c42ac3929f946a70505ee42be0ce8220f245a.patch";
hash = "sha256-QuVZBcHSn/DK+xbjM36Y89+w22vk7NRV4MkbjgvS28A=";
})

# Fix ignored return value of std::lock_guard
# Remove when version > 2.15.0
# Was changed as part of the big platform API change, no individual upstream commit with this fix
Expand All @@ -44,6 +52,33 @@ in
# Partially done in https://github.com/canonical/mir/pull/3192, though one of the calloc was fixed earlier
# when some code was moved into that file
./1003-mir-2_15-calloc-args-in-right-order.patch

# Drop gflags & glog dependencies
# Remove when version > 2.16.4
(fetchpatch {
name = "0101-Drop-unused-dependency-on-gflags.patch";
url = "https://github.com/canonical/mir/commit/15a40638e5e9c4b6a11b7fa446ad31e190f485e7.patch";
includes = [
"CMakeLists.txt"
"examples/mir_demo_server/CMakeLists.txt"
"examples/mir_demo_server/glog_logger.cpp"
];
hash = "sha256-qIsWCOs6Ap0jJ2cpgdO+xJHmSqC6zP+J3ALAfmlA6Vc=";
})
(fetchpatch {
name = "0102-Drop-the-glog-example.patch";
url = "https://github.com/canonical/mir/commit/8407da28ddb9a535df2775f224bf5143e8770d52.patch";
includes = [
"CMakeLists.txt"
"examples/mir_demo_server/CMakeLists.txt"
"examples/mir_demo_server/glog_logger.cpp"
"examples/mir_demo_server/glog_logger.h"
"examples/mir_demo_server/server_example.cpp"
"examples/mir_demo_server/server_example_log_options.cpp"
"examples/mir_demo_server/server_example_log_options.h"
];
hash = "sha256-jVhVR7wZZZGRS40z+HPNoGBLHulvE1nHRKgYhQ6/g9M=";
})
];
};
}

0 comments on commit 3c0a99e

Please sign in to comment.