ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

directfb: use source from GitHub as tarball is no longer available

Browse Source 
This has the side effect of fixing the build on ARM, because some required
files were missing from the tarball.
This commit is contained in:
Ben Wolsieffer 2019-08-18 22:16:48 -04:00
parent ffca877a7f
commit ec28d4ab14
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/development/libraries/directfb/default.nix
View File

@ -1,31 +1,29 @@
{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib { stdenv, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, flux, zlib
, libjpeg, freetype, libpng, giflib
, enableX11 ? true, xorg , enableX11 ? true, xorg
, enableSDL ? true, SDL }: , enableSDL ? true, SDL }:
let s = stdenv.mkDerivation rec {
rec { pname = "directfb";
version = "1.7.7"; version = "1.7.7";
name="directfb-${version}";
sha256 = "18r7h0pwbyyk8z3pgdv77nmma8lvr1si9gl1ghxgxf1ivhwcd1dp"; src = fetchFromGitHub {
url="http://directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${version}.tar.gz"; owner = "deniskropp";
} repo = "DirectFB";
; in rev = "DIRECTFB_${lib.replaceStrings ["."] ["_"] version}";
stdenv.mkDerivation { sha256 = "0bs3yzb7hy3mgydrj8ycg7pllrd2b6j0gxj596inyr7ihssr3i0y";
inherit (s) name;
src = fetchurl {
inherit (s) url sha256;
}; };
nativeBuildInputs = [ perl pkgconfig ]; nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ];
buildInputs = [ zlib libjpeg freetype giflib libpng ] buildInputs = [ zlib libjpeg freetype giflib libpng ]
++ stdenv.lib.optional enableSDL SDL ++ lib.optional enableSDL SDL
++ stdenv.lib.optionals enableX11 (with xorg; [ ++ lib.optionals enableX11 (with xorg; [
xorgproto libX11 libXext xorgproto libX11 libXext
libXrender libXrender
]); ]);
NIX_LDFLAGS="-lgcc_s"; NIX_LDFLAGS = "-lgcc_s";
configureFlags = [ configureFlags = [
"--enable-sdl" "--enable-sdl"
@ -35,14 +33,11 @@ stdenv.mkDerivation {
"--enable-fbdev" "--enable-fbdev"
"--enable-mmx" "--enable-mmx"
"--enable-sse" "--enable-sse"
#"--enable-sysfs" # not recognized
"--with-software" "--with-software"
"--with-smooth-scaling" "--with-smooth-scaling"
] ++ stdenv.lib.optionals enableX11 [ ] ++ lib.optional enableX11 "--enable-x11";
"--enable-x11"
];
meta = with stdenv.lib; { meta = with lib; {
description = "Graphics and input library designed with embedded systems in mind"; description = "Graphics and input library designed with embedded systems in mind";
longDescription = '' longDescription = ''
DirectFB is a thin library that provides hardware graphics acceleration, DirectFB is a thin library that provides hardware graphics acceleration,
@ -54,7 +49,7 @@ stdenv.mkDerivation {
power to embedded systems and sets a new standard for graphics under power to embedded systems and sets a new standard for graphics under
Linux. Linux.
''; '';
homepage = http://directfb.org/; homepage = "https://github.com/deniskropp/DirectFB";
license = licenses.lgpl21; license = licenses.lgpl21;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];

3
pkgs/development/libraries/directfb/default.upstream
View File

@ -1,3 +0,0 @@
url 'http://directfb.org/index.php?path=Main%2FDownloads'
version_link 'DirectFB-[0-9]'
minimize_overwrite