From f44cfd1f47ebf14ad0fafc8759d816a642905368 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 00:01:34 +0200 Subject: [PATCH] g-wrap: remove top-level override --- pkgs/by-name/g-/g-wrap/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/g-/g-wrap/package.nix b/pkgs/by-name/g-/g-wrap/package.nix index f31445c28561..2c410bd7c602 100644 --- a/pkgs/by-name/g-/g-wrap/package.nix +++ b/pkgs/by-name/g-/g-wrap/package.nix @@ -2,7 +2,7 @@ fetchurl, lib, stdenv, - guile, + guile_2_2, guile-lib, libffi, pkg-config, @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Note: Glib support is optional, but it's quite useful (e.g., it's used by # Guile-GNOME). buildInputs = [ - guile + guile_2_2 glib guile-lib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd2c7d907ec4..4a1bdcee0f0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6102,9 +6102,6 @@ with pkgs; griffe = with python3Packages; toPythonApplication griffe; gwrap = g-wrap; - g-wrap = callPackage ../by-name/g-/g-wrap/package.nix { - guile = guile_2_2; - }; hadolint = # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013