Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chars: init at 0.5.0 #103363

Merged
merged 1 commit into from Nov 23, 2020
Merged

chars: init at 0.5.0 #103363

merged 1 commit into from Nov 23, 2020

Conversation

bbigras
Copy link
Contributor

@bbigras bbigras commented Nov 10, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Member

@IvarWithoutBones IvarWithoutBones left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1 nit, otherwise LGTM 👍

pkgs/tools/text/chars/default.nix Show resolved Hide resolved
pkgs/tools/text/chars/default.nix Show resolved Hide resolved
@bbigras
Copy link
Contributor Author

bbigras commented Nov 11, 2020

uh. TIL. Thanks and done!

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/291

Co-authored-by: Ivar <41924494+IvarWithoutBones@users.noreply.github.com>
Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
@SuperSandro2000
Copy link
Member

diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix
index 18b29066ac56..fa58d110550e 100644
--- a/pkgs/tools/text/chars/default.nix
+++ b/pkgs/tools/text/chars/default.nix
@@ -1,6 +1,7 @@
-{ lib
+{ stdenv
 , fetchFromGitHub
 , rustPlatform
+, Security
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -16,7 +17,9 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1ampmw0l2wk2xp4q13aj5shxncqfh4dc3rsmpk2scaivanrsikn5";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Commandline tool to display information about unicode characters";
     homepage = "https://github.com/antifuchs/chars";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a00e1ec5bf4..6d58e2a81455 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -961,7 +961,9 @@ in
 
   charm = callPackage ../applications/misc/charm { };
 
-  chars = callPackage ../tools/text/chars { };
+  chars = callPackage ../tools/text/chars {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 

Fixes building on darwin.

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 103363 run on x86_64-linux 1

1 package built:
  • chars

@bbigras
Copy link
Contributor Author

bbigras commented Nov 23, 2020

Thanks @SuperSandro2000 !

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 103363 run on x86_64-darwin 1

1 package built:
  • chars

@SuperSandro2000 SuperSandro2000 merged commit 8c24e6e into NixOS:master Nov 23, 2020
@bbigras bbigras deleted the chars branch November 23, 2020 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants