tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
xscreensaver: 6.04 -> 6.06
+62
-22
pkgs/misc/screensavers/xscreensaver/default.nix
+62
-22
pkgs/misc/screensavers/xscreensaver/default.nix
···
1
-
{ lib, stdenv, fetchurl, makeWrapper
2
-
, pkg-config, intltool
3
-
, perl, perlPackages, gettext, libX11, libXext, libXi, libXt
4
-
, libXft, libXinerama, libXrandr, libXxf86vm, libGL, libGLU, gle
5
-
, gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam
6
-
, systemd, coreutils
1
+
{ lib
2
+
, stdenv
3
+
, fetchurl
4
+
, coreutils
5
+
, gdk-pixbuf
6
+
, gdk-pixbuf-xlib
7
+
, gettext
8
+
, gle
9
+
, gtk3
10
+
, intltool
11
+
, libGL
12
+
, libGLU
13
+
, libX11
14
+
, libXext
15
+
, libXft
16
+
, libXi
17
+
, libXinerama
18
+
, libXrandr
19
+
, libXt
20
+
, libXxf86vm
21
+
, libxml2
22
+
, makeWrapper
23
+
, pam
24
+
, perlPackages
25
+
, pkg-config
26
+
, systemd
7
27
, forceInstallAllHacks ? false
8
28
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
9
29
}:
10
30
11
-
stdenv.mkDerivation rec {
12
-
version = "6.04";
31
+
stdenv.mkDerivation (finalAttrs: {
13
32
pname = "xscreensaver";
33
+
version = "6.06";
14
34
15
35
src = fetchurl {
16
-
url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz";
17
-
sha256 = "sha256-eHAUsp8MV5Pswtk+EQmgSf9IqwwpuFHas09oPO72sVI=";
36
+
url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz";
37
+
hash = "sha256-9TT6uFqDbeW4vo6R/CG4DKfWpO2ThuviB9S+ek50mac=";
18
38
};
19
39
20
40
nativeBuildInputs = [
21
-
pkg-config intltool makeWrapper
41
+
intltool
42
+
makeWrapper
43
+
pkg-config
22
44
];
23
45
24
46
buildInputs = [
25
-
perl gettext libX11 libXext libXi libXt
26
-
libXft libXinerama libXrandr libXxf86vm libGL libGLU gle
27
-
gtk2 gdk-pixbuf gdk-pixbuf-xlib libxml2 pam
28
-
perlPackages.LWPProtocolHttps perlPackages.MozillaCA
29
-
] ++ lib.optional withSystemd systemd;
47
+
gdk-pixbuf
48
+
gdk-pixbuf-xlib
49
+
gettext
50
+
gle
51
+
gtk3
52
+
libGL
53
+
libGLU
54
+
libX11
55
+
libXext
56
+
libXft
57
+
libXi
58
+
libXinerama
59
+
libXrandr
60
+
libXt
61
+
libXxf86vm
62
+
libxml2
63
+
pam
64
+
perlPackages.LWPProtocolHttps
65
+
perlPackages.MozillaCA
66
+
perlPackages.perl
67
+
]
68
+
++ lib.optional withSystemd systemd;
30
69
31
70
preConfigure = ''
32
71
# Fix installation paths for GTK resources.
···
45
84
for bin in $out/bin/*; do
46
85
wrapProgram "$bin" \
47
86
--prefix PATH : "$out/libexec/xscreensaver" \
48
-
--prefix PATH : "${lib.makeBinPath [ coreutils perl ]}" \
87
+
--prefix PATH : "${lib.makeBinPath [ coreutils perlPackages.perl ]}" \
49
88
--prefix PERL5LIB ':' $PERL5LIB
50
89
done
51
-
'' + lib.optionalString forceInstallAllHacks ''
90
+
''
91
+
+ lib.optionalString forceInstallAllHacks ''
52
92
make -j$NIX_BUILD_CORES -C hacks/glx dnalogo
53
93
cat hacks/Makefile.in \
54
94
| grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks
···
60
100
meta = {
61
101
homepage = "https://www.jwz.org/xscreensaver/";
62
102
description = "A set of screensavers";
63
-
license = lib.licenses.mit;
64
-
maintainers = with lib.maintainers; [ raskin ];
65
-
platforms = lib.platforms.unix; # Once had cygwin problems
66
103
downloadPage = "https://www.jwz.org/xscreensaver/download.html";
104
+
license = lib.licenses.mit;
105
+
maintainers = with lib.maintainers; [ raskin AndersonTorres ];
106
+
platforms = lib.platforms.unix;
67
107
};
68
-
}
108
+
})