xscreensaver: 5.44 -> 6.00
This commit is contained in:
parent
e23957211c
commit
56490749ad
|
@ -1,62 +1,55 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, bc, perl, pam, libXext, libXScrnSaver, libX11
|
{ lib, stdenv, fetchurl
|
||||||
, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2
|
, pkg-config, intltool
|
||||||
, libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib
|
, perl, gettext, libX11, libXext, libXi, libXt
|
||||||
|
, libXft, libXinerama, libXrandr, libXxf86vm, libGL, libGLU, gle
|
||||||
|
, gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam
|
||||||
|
, systemd
|
||||||
, forceInstallAllHacks ? false
|
, forceInstallAllHacks ? false
|
||||||
|
, withSystemd ? stdenv.isLinux
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "5.44";
|
version = "6.00";
|
||||||
pname = "xscreensaver";
|
pname = "xscreensaver";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz";
|
url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "15bv05vpfjwsrqbazrjmm382jd7vvw0mp6y9vasn6wvxzjf0in3k";
|
sha256 = "WFCIl0chuCjr1x/T67AZ0b8xITPJVurJZy1h9rSddwY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
nativeBuildInputs = [
|
||||||
[ pkg-config bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam
|
pkg-config intltool
|
||||||
libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
|
];
|
||||||
libXxf86misc intltool xorg.appres makeWrapper gle gdk-pixbuf
|
|
||||||
gdk-pixbuf-xlib
|
|
||||||
];
|
|
||||||
|
|
||||||
preConfigure =
|
buildInputs = [
|
||||||
''
|
perl gettext libX11 libXext libXi libXt
|
||||||
# Fix installation paths for GTK resources.
|
libXft libXinerama libXrandr libXxf86vm libGL libGLU gle
|
||||||
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
|
gtk2 gdk-pixbuf gdk-pixbuf-xlib libxml2 pam
|
||||||
-i driver/Makefile.in po/Makefile.in.in
|
] ++ lib.optional withSystemd systemd;
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags =
|
preConfigure = ''
|
||||||
[ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
|
# Fix installation paths for GTK resources.
|
||||||
"--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
|
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
|
||||||
"--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
|
-i driver/Makefile.in po/Makefile.in.in
|
||||||
"--with-xshm-ext" "--with-xdbe-ext"
|
'';
|
||||||
"--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
|
|
||||||
];
|
|
||||||
|
|
||||||
postInstall = ''
|
configureFlags = [
|
||||||
wrapProgram $out/bin/xscreensaver-text \
|
"--with-app-defaults=${placeholder "out"}/share/xscreensaver/app-defaults"
|
||||||
--prefix PATH : ${lib.makeBinPath [xorg.appres]}
|
];
|
||||||
|
|
||||||
substituteInPlace $out/bin/xscreensaver-getimage-file \
|
postInstall = lib.optionalString forceInstallAllHacks ''
|
||||||
--replace '${perl}' '${perl.withPackages (p: with p;
|
make -j$NIX_BUILD_CORES -C hacks/glx dnalogo
|
||||||
[ EncodeLocale HTTPDate HTTPMessage IOSocketSSL
|
cat hacks/Makefile.in \
|
||||||
LWP LWPProtocolHttps MozillaCA NetHTTP
|
| grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks
|
||||||
NetSSLeay TryTiny URI
|
cat hacks/glx/Makefile.in \
|
||||||
])}'
|
| grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks/glx
|
||||||
''
|
cp -f $(find hacks -type f -perm -111 "!" -name "*.*" ) "$out/libexec/xscreensaver"
|
||||||
+ lib.optionalString forceInstallAllHacks ''
|
'';
|
||||||
make -C hacks/glx dnalogo
|
|
||||||
cat hacks/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -C hacks
|
|
||||||
cat hacks/glx/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -C hacks/glx
|
|
||||||
cp -f $(find hacks -type f -perm -111 "!" -name "*.*" ) "$out/libexec/xscreensaver"
|
|
||||||
''
|
|
||||||
;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://www.jwz.org/xscreensaver/";
|
homepage = "https://www.jwz.org/xscreensaver/";
|
||||||
description = "A set of screensavers";
|
description = "A set of screensavers";
|
||||||
|
license = lib.licenses.mit;
|
||||||
maintainers = with lib.maintainers; [ raskin ];
|
maintainers = with lib.maintainers; [ raskin ];
|
||||||
platforms = lib.platforms.unix; # Once had cygwin problems
|
platforms = lib.platforms.unix; # Once had cygwin problems
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
|
@ -26917,9 +26917,7 @@ in
|
||||||
|
|
||||||
xscope = callPackage ../applications/misc/xscope { };
|
xscope = callPackage ../applications/misc/xscope { };
|
||||||
|
|
||||||
xscreensaver = callPackage ../misc/screensavers/xscreensaver {
|
xscreensaver = callPackage ../misc/screensavers/xscreensaver { };
|
||||||
inherit (gnome2) libglade;
|
|
||||||
};
|
|
||||||
|
|
||||||
xsuspender = callPackage ../applications/misc/xsuspender { };
|
xsuspender = callPackage ../applications/misc/xsuspender { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue