Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 83a7fd2a77f7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aa7c91162e9d
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 24, 2019

  1. enlightenment.efl: 1.22.3 -> 1.22.5

    @romildo
    romildo committed Sep 24, 2019
    Copy the full SHA
    5560b8b View commit details

  2. enlightenment.efl: list dependencies in alphabetical order

    @romildo
    romildo committed Sep 24, 2019
    Copy the full SHA
    887aa51 View commit details

Commits on Oct 1, 2019

  1. Merge pull request #69353 from romildo/upd.efl 

    enlightenment.efl: 1.22.3 -> 1.22.5
    @romildo
    romildo authored Oct 1, 2019
    Copy the full SHA
    aa7c911 View commit details
Showing with 80 additions and 19 deletions.
  1. +80 −19 pkgs/desktops/enlightenment/efl.nix
99 changes: 80 additions & 19 deletions pkgs/desktops/enlightenment/efl.nix
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,94 @@
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig
, fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio
, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit
, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
, dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
, curl, libinput, systemd, mesa, writeText, gtk3
{ stdenv, fetchurl, pkgconfig, SDL, SDL2, alsaLib, bullet, curl, dbus,
doxygen, expat, fontconfig, freetype, fribidi, ghostscript, giflib,
glib, gst_all_1, gtk3, harfbuzz, jbig2dec, libGL, libdrm, libinput,
libjpeg, libpng, libpulseaudio, libraw, librsvg, libsndfile,
libspectre, libtiff, libwebp, libxkbcommon, luajit, lz4, mesa,
openjpeg, openssl, poppler, python27Packages, systemd, udev,
utillinux, writeText, xineLib, xorg, zlib
}:

stdenv.mkDerivation rec {
pname = "efl";
version = "1.22.3";
version = "1.22.5";

src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
sha256 = "1j1i8cwq4ym9z34ikv35mdmv5q7q69hdp494mc6l03g9n6cl2yky";
sha256 = "1cjk56z0whpzcqwg3xdq23kyp1g83xa67m9dlp7ywmb36bn4ca59";
};

nativeBuildInputs = [ pkgconfig gtk3 ];
nativeBuildInputs = [
gtk3
pkgconfig
];

buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa
giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.xorgproto
xorg.libX11 udev systemd ];
buildInputs = [
SDL
fontconfig
freetype
giflib
glib
gst_all_1.gst-libav
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gstreamer
libGL
libpng
libpulseaudio
libsndfile
libtiff
lz4
mesa
openssl
systemd
udev
xorg.libX11
xorg.libXcursor
xorg.xorgproto
zlib
];

propagatedBuildInputs = [ libxkbcommon python27Packages.dbus-python dbus libjpeg xorg.libXcomposite
xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
libinput utillinux fribidi SDL2 ];
propagatedBuildInputs = [
SDL2
alsaLib
bullet
curl
dbus
dbus
doxygen
expat
fribidi
ghostscript
harfbuzz
jbig2dec
libdrm
libinput
libjpeg
libraw
librsvg
libspectre
libwebp
libxkbcommon
luajit
openjpeg
poppler
python27Packages.dbus-python
utillinux
xineLib
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXinerama
xorg.libXp
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxcb
xorg.libxkbfile
xorg.xcbutilkeysyms
];

# ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
configureFlags = [