From b0c8fb3344d627619d93215494c9356ec12ed95a Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 00:05:57 +0200 Subject: [PATCH] guile-xcb: remove top-level override --- pkgs/by-name/gu/guile-xcb/package.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/gu/guile-xcb/package.nix b/pkgs/by-name/gu/guile-xcb/package.nix index 567c3e07a0ed..26f83441f1b9 100644 --- a/pkgs/by-name/gu/guile-xcb/package.nix +++ b/pkgs/by-name/gu/guile-xcb/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - guile, + guile_2_2, pkg-config, texinfo, }: @@ -24,13 +24,13 @@ stdenv.mkDerivation { pkg-config ]; buildInputs = [ - guile + guile_2_2 texinfo ]; configureFlags = [ - "--with-guile-site-dir=$(out)/${guile.siteDir}" - "--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}" + "--with-guile-site-dir=$(out)/${guile_2_2.siteDir}" + "--with-guile-site-ccache-dir=$(out)/${guile_2_2.siteCcacheDir}" ]; makeFlags = [ @@ -42,6 +42,6 @@ stdenv.mkDerivation { description = "XCB bindings for Guile"; license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = guile.meta.platforms; + platforms = guile_2_2.meta.platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 344288d86e77..6eef8f5f270f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5702,10 +5702,6 @@ with pkgs; guile = guile_3_0; - guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix { - guile = guile_2_2; - }; - msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { }; msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };