envchain: init at 1.0.1 #99978
Merged
envchain: init at 1.0.1 #99978
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonringer
reviewed
Oct 8, 2020
|
Done. My bad, |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
r-burns
reviewed
Oct 31, 2020
There was a problem hiding this comment.
Needed some changes to build on darwin
diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix
index 401714ca3e0..fae1f99de78 100644
--- a/pkgs/tools/misc/envchain/default.nix
+++ b/pkgs/tools/misc/envchain/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, libsecret, pkg-config, readline }:
+{ stdenv, fetchFromGitHub, libsecret, pkg-config, readline
+, Security
+, libedit
+}:
stdenv.mkDerivation rec {
pname = "envchain";
@@ -13,8 +16,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libsecret readline ];
+ buildInputs = [ libsecret readline ]
+ ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin [
+ Security libedit
+ ];
+ preBuild = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace Makefile --replace '-ltermcap' ' '
+ '';
makeFlags = [ "DESTDIR=$(out)" ];
meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a72d0656f6..43f09113069 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3645,7 +3645,9 @@ in
entr = callPackage ../tools/misc/entr { };
- envchain = callPackage ../tools/misc/envchain { };
+ envchain = callPackage ../tools/misc/envchain {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
eot_utilities = callPackage ../tools/misc/eot-utilities { };
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
|
Result of 1 package built:
|
|
To build on darwin the following patch is required: diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix
index 7f6cca2c1f87..fbd596c5f662 100644
--- a/pkgs/tools/misc/envchain/default.nix
+++ b/pkgs/tools/misc/envchain/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libsecret, pkg-config, readline }:
+{ stdenv, fetchFromGitHub, libedit, libsecret, ncurses, pkg-config, readline, Security }:
stdenv.mkDerivation rec {
pname = "envchain";
@@ -11,9 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "0qxwiqhb8cg0zbn5p0mvnbyxx1xwvgiricrkjlvxz13sf2ngq87p";
};
+ postPatch = ''
+ sed -i -e "s|-ltermcap|-lncurses|" Makefile
+ '';
+
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libsecret readline ];
+ buildInputs = [ libsecret readline ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ libedit ncurses Security ];
makeFlags = [ "DESTDIR=$(out)" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37f0447b1e9e..fa71e5fca493 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3692,7 +3692,7 @@ in
entr = callPackage ../tools/misc/entr { };
- envchain = callPackage ../tools/misc/envchain { };
+ envchain = callPackage ../tools/misc/envchain { inherit (pkgs.darwin.apple_sdk.frameworks) Security; };
eot_utilities = callPackage ../tools/misc/eot-utilities { };
|
Co-authored-by: Jon <jonringer@users.noreply.github.com> Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com> Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
|
Done. Thanks @SuperSandro2000 |
|
Result of 1 package built:
|
|
Result of 1 package built:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This tool is to avoid having sensible things in
.envfiles.Things done
Note that 1.0.1 is 4 years old.
The last commit in the repo is about 5 months old.
Tested saving a secret on Gnome. Didn't test it with envrc yet.
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)