xawtv: clean up
* Remove unnecessary linker and compiler flags * Listify makeFlags * Do not use DESTDIR (nasty) * Let generic builder set --prefix configureFlag * Install X11 app-defaults to more modern directory * Format with nixpkgs-fmt
This commit is contained in:
parent
814dcd907f
commit
9a338f230e
|
@ -1,25 +1,54 @@
|
||||||
{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xorgproto, libv4l
|
{ stdenv
|
||||||
, libFS, libXaw, libXpm, libXext, libSM, libICE, perl, linux}:
|
, fetchurl
|
||||||
|
, ncurses
|
||||||
|
, libjpeg
|
||||||
|
, libX11
|
||||||
|
, libXt
|
||||||
|
, alsaLib
|
||||||
|
, aalib
|
||||||
|
, libXft
|
||||||
|
, xorgproto
|
||||||
|
, libv4l
|
||||||
|
, libFS
|
||||||
|
, libXaw
|
||||||
|
, libXpm
|
||||||
|
, libXext
|
||||||
|
, libSM
|
||||||
|
, libICE
|
||||||
|
, perl
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "xawtv-3.106";
|
name = "xawtv-3.106";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2";
|
url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2";
|
||||||
sha256 = "174wd36rk0k23mgx9nlnpc398yd1f0wiv060963axg6sz0v4rksp";
|
sha256 = "174wd36rk0k23mgx9nlnpc398yd1f0wiv060963axg6sz0v4rksp";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
buildInputs = [
|
||||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${linux}/lib/modules/${linux.modDirVersion}/build"
|
ncurses
|
||||||
'';
|
libjpeg
|
||||||
|
libX11
|
||||||
|
libXt
|
||||||
|
libXft
|
||||||
|
xorgproto
|
||||||
|
libFS
|
||||||
|
perl
|
||||||
|
alsaLib
|
||||||
|
aalib
|
||||||
|
libXaw
|
||||||
|
libXpm
|
||||||
|
libXext
|
||||||
|
libSM
|
||||||
|
libICE
|
||||||
|
libv4l
|
||||||
|
];
|
||||||
|
|
||||||
configureFlags= [ "--prefix=" ];
|
makeFlags = [
|
||||||
|
"SUID_ROOT=" # do not try to setuid
|
||||||
NIX_LDFLAGS = "-lgcc_s";
|
"resdir=${placeholder ''out''}/share/X11"
|
||||||
|
];
|
||||||
makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX=";
|
|
||||||
|
|
||||||
buildInputs = [ncurses libjpeg libX11 libXt libXft xorgproto libFS perl alsaLib aalib
|
|
||||||
libXaw libXpm libXext libSM libICE libv4l];
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "TV application for Linux with apps and tools such as a teletext browser";
|
description = "TV application for Linux with apps and tools such as a teletext browser";
|
||||||
|
@ -28,5 +57,4 @@ stdenv.mkDerivation rec {
|
||||||
maintainers = with stdenv.lib.maintainers; [ domenkozar ];
|
maintainers = with stdenv.lib.maintainers; [ domenkozar ];
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue