summary refs log tree commit diff
diff options
context:
space:
mode:
authorgeistesk <github.jyf300hj@0x21.biz>2018-04-19 11:51:06 +0200
committergeistesk <github.jyf300hj@0x21.biz>2018-04-19 11:51:06 +0200
commitfa3f62025624185bdf7243c1c788d98004be2c76 (patch)
tree09c4e653297aba91706ff7ed1d353427266ff96f
parent12ce0db1bffb048fbf81a852aed7240aedc31757 (diff)
downloadnixpkgs-fa3f62025624185bdf7243c1c788d98004be2c76.tar
nixpkgs-fa3f62025624185bdf7243c1c788d98004be2c76.tar.gz
nixpkgs-fa3f62025624185bdf7243c1c788d98004be2c76.tar.bz2
nixpkgs-fa3f62025624185bdf7243c1c788d98004be2c76.tar.lz
nixpkgs-fa3f62025624185bdf7243c1c788d98004be2c76.tar.xz
nixpkgs-fa3f62025624185bdf7243c1c788d98004be2c76.tar.zst
nixpkgs-fa3f62025624185bdf7243c1c788d98004be2c76.zip
farbfeld, sent: wrap PATH for 2ff and sent
-rw-r--r--pkgs/applications/misc/sent/default.nix8
-rw-r--r--pkgs/development/libraries/farbfeld/default.nix6
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix
index 24e76500a6a..9bbae33b3e4 100644
--- a/pkgs/applications/misc/sent/default.nix
+++ b/pkgs/applications/misc/sent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, farbfeld, libX11, libXft
+{ stdenv, fetchurl, farbfeld, libX11, libXft, makeWrapper
 , patches ? [] }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv";
   };
 
-  buildInputs = [ farbfeld libX11 libXft ];
+  buildInputs = [ libX11 libXft ];
+  nativeBuildInputs = [ makeWrapper ];
 
   # unpacking doesn't create a directory
   sourceRoot = ".";
@@ -17,6 +18,9 @@ stdenv.mkDerivation rec {
   inherit patches;
 
   installFlags = [ "PREFIX=$(out)" ];
+  postInstall = ''
+    wrapProgram "$out/bin/sent" --prefix PATH : "${farbfeld}/bin"
+  '';
 
   meta = with stdenv.lib; {
     description = "A simple plaintext presentation tool";
diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix
index 7c0addea5e8..c23fc0bc59f 100644
--- a/pkgs/development/libraries/farbfeld/default.nix
+++ b/pkgs/development/libraries/farbfeld/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libpng, libjpeg }:
+{ stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
 
 stdenv.mkDerivation rec {
   name = "farbfeld-${version}";
@@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libpng libjpeg ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installFlags = "PREFIX=/ DESTDIR=$(out)";
+  postInstall = ''
+    wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin"
+  '';
 
   meta = with stdenv.lib; {
     description = "Suckless image format with conversion tools";