From 3e1214876010df660d7f0e5c3500bd42fe344589 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 12 Jan 2026 17:36:31 +0100 Subject: [PATCH] cctag: move to pkgs/by-name this shouldn't create any rebuilds --- .../cc}/cctag/cmake-install-include-dir.patch | 0 .../cc}/cctag/cmake-no-apple-rpath.patch | 0 .../cctag/default.nix => by-name/cc/cctag/package.nix} | 8 +++++--- pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 5 insertions(+), 7 deletions(-) rename pkgs/{development/libraries => by-name/cc}/cctag/cmake-install-include-dir.patch (100%) rename pkgs/{development/libraries => by-name/cc}/cctag/cmake-no-apple-rpath.patch (100%) rename pkgs/{development/libraries/cctag/default.nix => by-name/cc/cctag/package.nix} (93%) diff --git a/pkgs/development/libraries/cctag/cmake-install-include-dir.patch b/pkgs/by-name/cc/cctag/cmake-install-include-dir.patch similarity index 100% rename from pkgs/development/libraries/cctag/cmake-install-include-dir.patch rename to pkgs/by-name/cc/cctag/cmake-install-include-dir.patch diff --git a/pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch b/pkgs/by-name/cc/cctag/cmake-no-apple-rpath.patch similarity index 100% rename from pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch rename to pkgs/by-name/cc/cctag/cmake-no-apple-rpath.patch diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/by-name/cc/cctag/package.nix similarity index 93% rename from pkgs/development/libraries/cctag/default.nix rename to pkgs/by-name/cc/cctag/package.nix index 60de365c149e..37cb19617b65 100644 --- a/pkgs/development/libraries/cctag/default.nix +++ b/pkgs/by-name/cc/cctag/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, cmake, @@ -9,9 +9,11 @@ opencv, onetbb, - avx2Support ? stdenv.hostPlatform.avx2Support, + avx2Support ? clangStdenv.hostPlatform.avx2Support, }: - +let + stdenv = clangStdenv; +in stdenv.mkDerivation rec { pname = "cctag"; version = "1.0.4"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2227666ee75..f922de41f537 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6645,10 +6645,6 @@ with pkgs; ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu); - cctag = callPackage ../development/libraries/cctag { - stdenv = clangStdenv; - }; - ceedling = callPackage ../development/tools/ceedling { }; celt = callPackage ../development/libraries/celt { };