pyrox.dev
Merge pull request #25412 from romildo/fix.efl
{terminology,ephoto,rage,econnman}: wrap libcurl.so in LD_LIBRARY_PATH
+3
-2
pkgs/desktops/enlightenment/econnman.nix
+3
-2
pkgs/desktops/enlightenment/econnman.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }:
1
+
{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, curl, makeWrapper }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "econnman-${version}";
···
11
11
12
12
nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ];
13
13
14
-
buildInputs = [ efl python2Packages.python dbus ];
14
+
buildInputs = [ efl python2Packages.python dbus curl ];
15
15
16
16
pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ];
17
17
18
18
postInstall = ''
19
19
wrapPythonPrograms
20
+
wrapProgram $out/bin/econnman-bin --prefix LD_LIBRARY_PATH : ${curl.out}/lib
20
21
'';
21
22
22
23
meta = {
+7
-7
pkgs/desktops/enlightenment/ephoto.nix
+7
-7
pkgs/desktops/enlightenment/ephoto.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, efl }:
1
+
{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "ephoto-${version}";
···
9
9
sha256 = "0l6zrk22fap6pylmzxwp6nycy8l5wdc7jza890h4zrwmpfag8w31";
10
10
};
11
11
12
-
nativeBuildInputs = [
13
-
pkgconfig
14
-
];
12
+
nativeBuildInputs = [ pkgconfig makeWrapper ];
15
13
16
-
buildInputs = [
17
-
efl
18
-
];
14
+
buildInputs = [ efl curl ];
19
15
20
16
NIX_CFLAGS_COMPILE = [
21
17
"-I${efl}/include/ecore-con-1"
···
28
24
"-I${efl}/include/ethumb-1"
29
25
"-I${efl}/include/ethumb-client-1"
30
26
];
27
+
28
+
postInstall = ''
29
+
wrapProgram $out/bin/ephoto --prefix LD_LIBRARY_PATH : ${curl.out}/lib
30
+
'';
31
31
32
32
meta = {
33
33
description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
+6
-1
pkgs/desktops/enlightenment/rage.nix
+6
-1
pkgs/desktops/enlightenment/rage.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, wrapGAppsHook }:
1
+
{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, curl, wrapGAppsHook }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "rage-${version}";
···
21
21
gst_all_1.gst-plugins-good
22
22
gst_all_1.gst-plugins-bad
23
23
gst_all_1.gst-libav
24
+
curl
24
25
];
25
26
26
27
NIX_CFLAGS_COMPILE = [
···
37
38
"-I${efl}/include/ethumb-1"
38
39
"-I${efl}/include/ethumb-client-1"
39
40
];
41
+
42
+
postInstall = ''
43
+
wrapProgram $out/bin/rage --prefix LD_LIBRARY_PATH : ${curl.out}/lib
44
+
'';
40
45
41
46
meta = {
42
47
description = "Video + Audio player along the lines of mplayer";
+9
-3
pkgs/desktops/enlightenment/terminology.nix
+9
-3
pkgs/desktops/enlightenment/terminology.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, efl }:
1
+
{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "terminology-${version}";
···
9
9
sha256 = "1x4j2q4qqj10ckbka0zaq2r2zm66ff1x791kp8slv1ff7fw45vdz";
10
10
};
11
11
12
-
nativeBuildInputs = [ pkgconfig ];
12
+
nativeBuildInputs = [ pkgconfig makeWrapper ];
13
13
14
-
buildInputs = [ efl ];
14
+
buildInputs = [ efl curl ];
15
15
16
16
NIX_CFLAGS_COMPILE = [
17
17
"-I${efl}/include/ecore-con-1"
···
21
21
"-I${efl}/include/eo-1"
22
22
"-I${efl}/include/ethumb-1"
23
23
];
24
+
25
+
postInstall = ''
26
+
for f in $out/bin/*; do
27
+
wrapProgram $f --prefix LD_LIBRARY_PATH : ${curl.out}/lib
28
+
done
29
+
'';
24
30
25
31
meta = {
26
32
description = "The best terminal emulator written with the EFL";