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

Merge pull request #37920 from romildo/fix.efl

Browse Source 
efl: patch binary to handle manual dependency on libcurl.so
This commit is contained in:
Jörg Thalheim 2018-03-31 18:32:07 +01:00 committed by GitHub
commit d060c3d7f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 24 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, curl, makeWrapper }: { stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "econnman-${version}"; name = "econnman-${version}";
@ -11,13 +11,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ]; nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ];
buildInputs = [ efl python2Packages.python dbus curl ]; buildInputs = [ efl python2Packages.python dbus ];
pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ]; pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ];
postInstall = '' postInstall = ''
wrapPythonPrograms wrapPythonPrograms
wrapProgram $out/bin/econnman-bin --prefix LD_LIBRARY_PATH : ${curl.out}/lib
''; '';
meta = { meta = {

6
pkgs/desktops/enlightenment/efl.nix
View File

@ -70,6 +70,12 @@ stdenv.mkDerivation rec {
'Cflags: -I''${includedir}/eina-1/eina'"$modules" 'Cflags: -I''${includedir}/eina-1/eina'"$modules"
''; '';
# EFL applications depend on libcurl, although it is linked at
# runtime by hand in code (it is dlopened).
postFixup = ''
patchelf --add-needed ${curl.out}/lib/libcurl.so $out/lib/libecore_con.so
'';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, efl, pcre, curl, makeWrapper }: { stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ephoto-${version}"; name = "ephoto-${version}";
@ -11,11 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ]; nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ];
buildInputs = [ efl pcre curl ]; buildInputs = [ efl pcre ];
postInstall = ''
wrapProgram $out/bin/ephoto --prefix LD_LIBRARY_PATH : ${curl.out}/lib
'';
meta = { meta = {
description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; description = "Image viewer and editor written using the Enlightenment Foundation Libraries";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, curl, wrapGAppsHook }: { stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rage-${version}"; name = "rage-${version}";
@ -24,12 +24,7 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-bad
gst_all_1.gst-libav gst_all_1.gst-libav
pcre pcre
curl ];
];
postInstall = ''
wrapProgram $out/bin/rage --prefix LD_LIBRARY_PATH : ${curl.out}/lib
'';
meta = { meta = {
description = "Video + Audio player along the lines of mplayer"; description = "Video + Audio player along the lines of mplayer";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, efl, pcre, curl, makeWrapper }: { stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "terminology-${version}"; name = "terminology-${version}";
@ -17,15 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
efl efl
pcre pcre
curl
]; ];
postInstall = ''
for f in $out/bin/*; do
wrapProgram $f --prefix LD_LIBRARY_PATH : ${curl.out}/lib
done
'';
meta = { meta = {
description = "The best terminal emulator written with the EFL"; description = "The best terminal emulator written with the EFL";
homepage = http://enlightenment.org/; homepage = http://enlightenment.org/;