mirror of
https://github.com/tiennm99/serena.git
synced 2026-10-11 03:13:51 +00:00
Adapt the flake to nixpkgs' deprecation of the stdenv platform predicates
nixpkgs now warns on every access to the `stdenv.is*` shorthands, which hide the build/host/target distinction (https://github.com/NixOS/nixpkgs/pull/518407). The nixpkgs pinned here predates that change, but a future update will surface the warnings. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
4ec3ce398e
commit
6d387aa8ec
1 file changed
+6
-6
@@ -79,7 +79,7 @@
|
||||
];
|
||||
});
|
||||
}
|
||||
// lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
// lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
|
||||
# pyproject-nix's virtualenv resolver follows pyproject-style
|
||||
# passthru.dependencies, while these GI bindings are already packaged
|
||||
# by nixpkgs' Python infrastructure. nixpkgsPrebuilt is the upstream
|
||||
@@ -146,11 +146,11 @@
|
||||
dontWrapGApps = true;
|
||||
nativeBuildInputs =
|
||||
[pkgs.makeWrapper]
|
||||
++ lib.optionals pkgs.stdenv.isLinux [
|
||||
++ lib.optionals pkgs.stdenv.hostPlatform.isLinux [
|
||||
pkgs.wrapGAppsHook3
|
||||
pkgs.gobject-introspection
|
||||
];
|
||||
buildInputs = lib.optionals pkgs.stdenv.isLinux [
|
||||
buildInputs = lib.optionals pkgs.stdenv.hostPlatform.isLinux [
|
||||
pkgs.gtk3
|
||||
pkgs.libayatana-appindicator
|
||||
];
|
||||
@@ -159,7 +159,7 @@
|
||||
|
||||
mkdir -p $out/bin
|
||||
${
|
||||
lib.optionalString (!pkgs.stdenv.isLinux) ''
|
||||
lib.optionalString (!pkgs.stdenv.hostPlatform.isLinux) ''
|
||||
ln -s ${packages.serena-env}/bin/serena $out/bin/serena
|
||||
''
|
||||
}
|
||||
@@ -170,7 +170,7 @@
|
||||
# Run the GApps fixup phase so the wrapper gets GI_TYPELIB_PATH for
|
||||
# Gtk and AyatanaAppIndicator3. This is the same pattern nixpkgs uses
|
||||
# for pystray consumers such as plex-mpv-shim and jellyfin-mpv-shim.
|
||||
preFixup = lib.optionalString pkgs.stdenv.isLinux ''
|
||||
preFixup = lib.optionalString pkgs.stdenv.hostPlatform.isLinux ''
|
||||
makeWrapper ${packages.serena-env}/bin/serena $out/bin/serena "''${gappsWrapperArgs[@]}"
|
||||
'';
|
||||
meta = {
|
||||
@@ -201,7 +201,7 @@
|
||||
UV_PYTHON_DOWNLOADS = "never";
|
||||
UV_PYTHON = python.interpreter;
|
||||
}
|
||||
// lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
// lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath pkgs.pythonManylinuxPackages.manylinux1;
|
||||
};
|
||||
shellHook = ''
|
||||
|
||||
Reference in new issue
Block a user