JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25412 from romildo/fix.efl

Browse Source 
{terminology,ephoto,rage,econnman}: wrap libcurl.so in LD_LIBRARY_PATH
This commit is contained in:
vbgl 2017-07-18 21:30:38 +02:00 committed by GitHub
commit c17ddcd40c
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/enlightenment/econnman.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }:
{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, curl, makeWrapper }:
stdenv.mkDerivation rec {
name = "econnman-${version}";
@ -11,12 +11,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ];
buildInputs = [ efl python2Packages.python dbus ];
buildInputs = [ efl python2Packages.python dbus curl ];
pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ];
postInstall = ''
wrapPythonPrograms
wrapProgram $out/bin/econnman-bin --prefix LD_LIBRARY_PATH : ${curl.out}/lib
'';
meta = {

14
pkgs/desktops/enlightenment/ephoto.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, efl }:
{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }:
stdenv.mkDerivation rec {
name = "ephoto-${version}";
@ -9,13 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0l6zrk22fap6pylmzxwp6nycy8l5wdc7jza890h4zrwmpfag8w31";
};
nativeBuildInputs = [
pkgconfig
];
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [
efl
];
buildInputs = [ efl curl ];
NIX_CFLAGS_COMPILE = [
"-I${efl}/include/ecore-con-1"
@ -29,6 +25,10 @@ stdenv.mkDerivation rec {
"-I${efl}/include/ethumb-client-1"
];
postInstall = ''
wrapProgram $out/bin/ephoto --prefix LD_LIBRARY_PATH : ${curl.out}/lib
'';
meta = {
description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
homepage = http://smhouston.us/ephoto/;

7
pkgs/desktops/enlightenment/rage.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, wrapGAppsHook }:
{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, curl, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "rage-${version}";
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-libav
curl
];
NIX_CFLAGS_COMPILE = [
@ -38,6 +39,10 @@ stdenv.mkDerivation rec {
"-I${efl}/include/ethumb-client-1"
];
postInstall = ''
wrapProgram $out/bin/rage --prefix LD_LIBRARY_PATH : ${curl.out}/lib
'';
meta = {
description = "Video + Audio player along the lines of mplayer";
homepage = http://enlightenment.org/;

12
pkgs/desktops/enlightenment/terminology.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, efl }:
{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }:
stdenv.mkDerivation rec {
name = "terminology-${version}";
@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1x4j2q4qqj10ckbka0zaq2r2zm66ff1x791kp8slv1ff7fw45vdz";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ efl ];
buildInputs = [ efl curl ];
NIX_CFLAGS_COMPILE = [
"-I${efl}/include/ecore-con-1"
@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
"-I${efl}/include/ethumb-1"
];
postInstall = ''
for f in $out/bin/*; do
wrapProgram $f --prefix LD_LIBRARY_PATH : ${curl.out}/lib
done
'';
meta = {
description = "The best terminal emulator written with the EFL";
homepage = http://enlightenment.org/;