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:
Jan Tojnar 2019-12-29 22:15:41 +01:00
parent 814dcd907f
commit 9a338f230e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,25 +1,54 @@
{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xorgproto, libv4l
, libFS, libXaw, libXpm, libXext, libSM, libICE, perl, linux}:
{ stdenv
, fetchurl
, ncurses
, libjpeg
, libX11
, libXt
, alsaLib
, aalib
, libXft
, xorgproto
, libv4l
, libFS
, libXaw
, libXpm
, libXext
, libSM
, libICE
, perl
}:
stdenv.mkDerivation rec {
name = "xawtv-3.106";
src = fetchurl {
url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2";
sha256 = "174wd36rk0k23mgx9nlnpc398yd1f0wiv060963axg6sz0v4rksp";
};
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${linux}/lib/modules/${linux.modDirVersion}/build"
'';
buildInputs = [
ncurses
libjpeg
libX11
libXt
libXft
xorgproto
libFS
perl
alsaLib
aalib
libXaw
libXpm
libXext
libSM
libICE
libv4l
];
configureFlags= [ "--prefix=" ];
NIX_LDFLAGS = "-lgcc_s";
makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX=";
buildInputs = [ncurses libjpeg libX11 libXt libXft xorgproto libFS perl alsaLib aalib
libXaw libXpm libXext libSM libICE libv4l];
makeFlags = [
"SUID_ROOT=" # do not try to setuid
"resdir=${placeholder ''out''}/share/X11"
];
meta = {
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 ];
platforms = stdenv.lib.platforms.linux;
};
}