From 7d5abdca118f3bc3923067855ffebe3371c4bf49 Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Tue, 22 Nov 2016 17:02:32 +0100
Subject: [PATCH] aptly: use wrapProgram instead of propagatedUserEnvPkgs
 (#20622)

---
 pkgs/tools/misc/aptly/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index b1dd71a8882f..a39b4247109b 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, gnupg1compat, bzip2, xz, graphviz }:
+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg1compat, bzip2, xz, graphviz }:
 
 buildGoPackage rec {
   name = "aptly-${version}";
@@ -15,12 +15,14 @@ buildGoPackage rec {
   goPackagePath = "github.com/smira/aptly";
   goDeps = ./deps.nix;
 
+  nativeBuildInputs = [ makeWrapper ];
+
   postInstall = ''
     rm $bin/bin/man
+    wrapProgram "$bin/bin/aptly" \
+      --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat bzip2 xz graphviz ]}"
   '';
 
-  propagatedUserEnvPkgs = [ gnupg1compat bzip2.bin xz.bin graphviz ];
-
   meta = with stdenv.lib; {
     homepage = https://www.aptly.info;
     description = "Debian repository management tool";