From f867fae833b56df00f6b3f7ec31e9f12dc1ee70e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 8 May 2024 18:09:38 +0200 Subject: [PATCH] xml-tooling-c: adopt, migrate to by-name, refactor --- .../xm/xml-tooling-c/package.nix} | 37 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 29 insertions(+), 10 deletions(-) rename pkgs/{development/libraries/xml-tooling-c/default.nix => by-name/xm/xml-tooling-c/package.nix} (53%) diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/by-name/xm/xml-tooling-c/package.nix similarity index 53% rename from pkgs/development/libraries/xml-tooling-c/default.nix rename to pkgs/by-name/xm/xml-tooling-c/package.nix index f58f50b4a72f..439f7e64899b 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/by-name/xm/xml-tooling-c/package.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config -, boost, curl, openssl, log4shib, xercesc, xml-security-c +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + pkg-config, + boost, + curl, + openssl, + log4shib, + xercesc, + xml-security-c, }: stdenv.mkDerivation rec { @@ -12,17 +22,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU="; }; - buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ + boost + curl + openssl + log4shib + xercesc + xml-security-c + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14"; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2"; - platforms = platforms.unix; - license = licenses.asl20; - maintainers = [ ]; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sigmanificient ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38897c6125b..91a14ee840e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25052,8 +25052,6 @@ with pkgs; xml-security-c = callPackage ../development/libraries/xml-security-c { }; - xml-tooling-c = callPackage ../development/libraries/xml-tooling-c { }; - xlslib = callPackage ../development/libraries/xlslib { }; xsimd = callPackage ../development/libraries/xsimd { };