nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39144 from geistesk/farbfeld-sent-path

Browse Source 
farbfeld, sent: wrap PATH for 2ff and sent
This commit is contained in:
Jörg Thalheim 2018-04-22 15:42:20 +01:00 committed by GitHub
commit 69ee53a899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/sent/default.nix
View File

@ -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";

6
pkgs/development/libraries/farbfeld/default.nix
View File

@ -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";