From d171b45e53380a1da58d2c91a599edd9163f2c65 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 6 Nov 2024 14:41:37 -0600 Subject: [PATCH 1/2] sqlpage: format --- pkgs/servers/sqlpage/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix index 4b9009091004..52944113b7aa 100644 --- a/pkgs/servers/sqlpage/default.nix +++ b/pkgs/servers/sqlpage/default.nix @@ -1,12 +1,13 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, sqlite -, zstd -, stdenv -, darwin -, fetchurl +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + sqlite, + zstd, + stdenv, + darwin, + fetchurl, }: let @@ -73,7 +74,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace sqlpage/tomselect.js \ --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js */' \ "$(cat ${tomselect})" - ''; + ''; cargoHash = "sha256-/B8tayEbyOsc0/po1YQKtp694X12B3I50OU4cMwJo8Q="; From e1ad199c2b364a4a7ad1f3a19f87576ad38bea3a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 6 Nov 2024 14:42:25 -0600 Subject: [PATCH 2/2] sqlpage: darwin sdk refactor We can inherit sdk from stdenv and don't need to declare the frameworks. --- pkgs/servers/sqlpage/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix index 52944113b7aa..148cc8d944a8 100644 --- a/pkgs/servers/sqlpage/default.nix +++ b/pkgs/servers/sqlpage/default.nix @@ -5,8 +5,6 @@ pkg-config, sqlite, zstd, - stdenv, - darwin, fetchurl, }: @@ -82,16 +80,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - sqlite - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + sqlite + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true;