From d9bb201fe4ced45c405c81547590e7ee83e2c7ac Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 07:31:40 +0100 Subject: [PATCH] construo: move to pkgs/by-name this shouldn't create any rebuilds --- .../co/construo/package.nix} | 16 ++++++++++------ pkgs/top-level/all-packages.nix | 14 ++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) rename pkgs/{games/construo/default.nix => by-name/co/construo/package.nix} (69%) diff --git a/pkgs/games/construo/default.nix b/pkgs/by-name/co/construo/package.nix similarity index 69% rename from pkgs/games/construo/default.nix rename to pkgs/by-name/co/construo/package.nix index 77c6d9b272f6..4cbf18d1abf3 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/by-name/co/construo/package.nix @@ -5,9 +5,12 @@ libX11, zlib, xorgproto, - libGL ? null, - libGLU ? null, - libglut ? null, + withLibGL ? !stdenv.hostPlatform.isDarwin, + libGL, + withLibGLU ? !stdenv.hostPlatform.isDarwin, + libGLU, + withLibglut ? !stdenv.hostPlatform.isDarwin, + libglut, }: stdenv.mkDerivation rec { @@ -24,9 +27,9 @@ stdenv.mkDerivation rec { zlib xorgproto ] - ++ lib.optional (libGL != null) libGL - ++ lib.optional (libGLU != null) libGLU - ++ lib.optional (libglut != null) libglut; + ++ lib.optional withLibGL libGL + ++ lib.optional withLibGLU libGLU + ++ lib.optional withLibglut libglut; preConfigure = '' substituteInPlace src/Makefile.in \ @@ -38,5 +41,6 @@ stdenv.mkDerivation rec { mainProgram = "construo.x11"; homepage = "http://fs.fsf.org/construo/"; license = lib.licenses.gpl3; + priority = 10; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7016f677632..ea050fde2cde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12193,16 +12193,10 @@ with pkgs; cataclysm-dda-git = cataclysmDDA.git.tiles; - construoBase = lowPrio ( - callPackage ../games/construo { - libGL = null; - libGLU = null; - libglut = null; - } - ); - - construo = construoBase.override { - inherit libGL libGLU libglut; + construoBase = construo.override { + withLibGL = false; + withLibGLU = false; + withLibglut = false; }; crawlTiles = callPackage ../by-name/cr/crawl/package.nix {