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

gopass: 1.8.6 -> unstable-2019-07-31 #66697

Closed
wants to merge 1 commit into from

Conversation

colemickens
Copy link
Member

Motivation for this change

Mostly just to get feedback on how to build the new version built with module support.

cc: @worldofpeace

Here's the failing build log: https://gist.github.com/colemickens/e0f7be3c350a583bb9c69b6caa9b73f2

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @

@worldofpeace
Copy link
Contributor

This works for me @colemickens

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 25b7a6580ad..0765b16c8a3 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -3,9 +3,6 @@
 , wl-clipboard, xclip
 , makeWrapper }:
 
-let
-  metadata = import ./metadata.nix;
-in
 buildGoModule rec {
   pname = "gopass";
   version = "8c7b4a250052d401722b6cbf9308b23a3d3d5661";
@@ -20,29 +17,25 @@ buildGoModule rec {
   modSha256 = "0ijj5sc2q9fx94slxxzqnx97f833pk48a0jfvq9dk9y9biszf2q4";
 
   nativeBuildInputs = [ makeWrapper ];
-  DESTDIR = placeholder "out";
-  
+
+  makeFlags = [
+    "PREFIX=${placeholder ''out''}"
+  ];
+
   wrapperPath = with stdenv.lib; makeBinPath ([
     git
     gnupg
     xclip
   ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard);
 
-  postInstall = ''
-    mkdir -p \
-      $bin/share/bash-completion/completions \
-      $bin/share/zsh/site-functions \
-      $bin/share/fish/vendor_completions.d
-    $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass
-    $bin/bin/gopass completion zsh  > $bin/share/zsh/site-functions/_gopass
-    $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish
-  '';
-
   postFixup = ''
-    wrapProgram $bin/bin/gopass \
+    wrapProgram $out/bin/gopass \
       --prefix PATH : "${wrapperPath}"
   '';
 
+  # Use makefile installPhase for completions
+  installPhase = null;
+
   meta = with stdenv.lib; {
     description     = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go.";
     homepage        = https://www.gopass.pw/;

@kalbasit
Copy link
Member

@GrahamcOfBorg build gopass

@colemickens
Copy link
Member Author

Thanks @worldofpeace. No need to merge this, IMO, but I did update it so it will be around for then next gopass release.

@worldofpeace worldofpeace added the 2.status: wait-for-upstream Waiting for upstream fix (or their other action). label Aug 23, 2019
@marsam
Copy link
Contributor

marsam commented May 1, 2020

addressed by #86503

@marsam marsam closed this May 1, 2020
@colemickens colemickens deleted the nixpkgs-gopass branch December 30, 2022 01:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants