public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sct: fix segfault when DISPLAY is empty, clean up derivation

This commit is contained in:
Yegor Timoshenko 2017-09-26 11:04:27 +00:00
parent cee657f9a3
commit 44beb56540
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/X11/sct/DISPLAY-segfault.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/sct.c 2017-09-22 00:44:20.270421881 +0000
+++ b/sct.c 2017-09-26 10:50:38.964562740 +0000
@@ -36,6 +36,7 @@
main(int argc, char **argv)
{
Display *dpy = XOpenDisplay(NULL);
+ if (!dpy) exit(1);
int screen = DefaultScreen(dpy);
Window root = RootWindow(dpy, screen);

41
pkgs/tools/X11/sct/default.nix
View File

@ -1,31 +1,26 @@
{stdenv, fetchurl, libX11, libXrandr}: { stdenv, fetchurl, libX11, libXrandr }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sct"; name = "sct";
buildInputs = [libX11 libXrandr];
src = fetchurl { src = fetchurl {
url = http://www.tedunangst.com/flak/files/sct.c; url = http://www.tedunangst.com/flak/files/sct.c;
sha256 = "01f3ndx3s6d2qh2xmbpmhd4962dyh8yp95l87xwrs4plqdz6knhd"; sha256 = "01f3ndx3s6d2qh2xmbpmhd4962dyh8yp95l87xwrs4plqdz6knhd";
# Discussion regarding the checksum and the source code can be found in issue #17163
# The code seems unmaintained, yet an unknown (probably small change) in the code caused
# failed builds as the checksum had changed.
# The checksum is updated for now, however, this is unpractical and potentially unsafe
# so any future changes might warrant a fork of the (feature complete) project.
# The code is under public domain.
}; };
phases = ["patchPhase" "buildPhase" "installPhase"];
patchPhase = '' unpackPhase = "cat ${src} > sct.c";
sed -re "/Xlibint/d" ${src} > sct.c patches = [ ./DISPLAY-segfault.patch ];
'';
buildPhase = "gcc -std=c99 sct.c -o sct -lX11 -lXrandr -lm"; buildInputs = [ libX11 libXrandr ];
installPhase = '' buildPhase = "cc sct.c -o sct -lm -lX11 -lXrandr";
mkdir -p "$out/bin"
cp sct "$out/bin" installPhase = "install -Dt $out/bin sct";
'';
meta = { meta = with stdenv.lib; {
description = ''A minimal utility to set display colour temperature''; homepage = https://www.tedunangst.com/flak/post/sct-set-color-temperature;
maintainers = [stdenv.lib.maintainers.raskin]; description = "A minimal utility to set display colour temperature";
platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd; maintainers = [ maintainers.raskin ];
license = licenses.publicDomain;
platforms = with platforms; linux ++ freebsd ++ openbsd;
}; };
} }