From ba9e09cc7687acec60caf56538faae54f4a5f960 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 11 Oct 2025 19:17:40 +0200 Subject: [PATCH 1/2] bsc: set updateScript --- pkgs/by-name/bs/bsc/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/bs/bsc/package.nix b/pkgs/by-name/bs/bsc/package.nix index 274e258dba34..e9993023f300 100644 --- a/pkgs/by-name/bs/bsc/package.nix +++ b/pkgs/by-name/bs/bsc/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, llvmPackages, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -33,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${placeholder "out"}" ]; + passthru.updateScript = nix-update-script {}; + meta = { description = "High performance block-sorting data compression library"; homepage = "http://libbsc.com/"; From a418816bb763715fc59f1c99aefd703819d3cabd Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 11 Oct 2025 19:17:52 +0200 Subject: [PATCH 2/2] bsc: 3.3.6 -> 3.3.12 --- pkgs/by-name/bs/bsc/package.nix | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/bs/bsc/package.nix b/pkgs/by-name/bs/bsc/package.nix index e9993023f300..a8c8688ea5f0 100644 --- a/pkgs/by-name/bs/bsc/package.nix +++ b/pkgs/by-name/bs/bsc/package.nix @@ -3,38 +3,34 @@ stdenv, fetchFromGitHub, llvmPackages, + cmake, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "bsc"; - version = "3.3.6"; + version = "3.3.12"; src = fetchFromGitHub { owner = "IlyaGrebnov"; repo = "libbsc"; tag = "v${finalAttrs.version}"; - hash = "sha256-iUFKTDSAg2/57TPvR0nlmfVN2Z6O9kZKIg+BQQKvr/o="; + hash = "sha256-3dFwmThnDzbXB6m/rDfbSz4DZAlIsm4gUOT7YwexpKA="; }; enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; - postPatch = lib.optional (!stdenv.hostPlatform.isx86) '' - substituteInPlace makefile \ - --replace-fail "-mavx2" "" - - substituteInPlace makefile.cuda \ - --replace-fail "-mavx2" "" + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "check_c_compiler_flag(-march=native COMPILER_SUPPORTS_MARCH_NATIVE_C)" "" \ + --replace-fail "check_cxx_compiler_flag(-march=native COMPILER_SUPPORTS_MARCH_NATIVE_CXX)" "" ''; - makeFlags = [ - "CC=$(CXX)" - "PREFIX=${placeholder "out"}" - ]; - - passthru.updateScript = nix-update-script {}; + passthru.updateScript = nix-update-script { }; meta = { description = "High performance block-sorting data compression library";