diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-04-22 12:57:26 -0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-04-23 02:11:50 +0000 |
| commit | 8b75d0ee5cff8dd539e955eb96c8971d679ea922 (patch) | |
| tree | 2e2c0fc0ec988d3b6b49eb365eab4c48897fae6c | |
| parent | Merge pull request #227606 from NixOS/backport-227225-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-227646-to-release-22.11.tar.gz | |
xscreensaver: 6.04 -> 6.06origin/backport-227646-to-release-22.11
(cherry picked from commit cb1814a681ec7c6199d379e8da3908dd5dc27968)
| -rw-r--r-- | pkgs/misc/screensavers/xscreensaver/default.nix | 84 |
1 files changed, 62 insertions, 22 deletions
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 72e283eaf11c..699741992525 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,32 +1,71 @@ -{ lib, stdenv, fetchurl, makeWrapper -, pkg-config, intltool -, perl, perlPackages, gettext, libX11, libXext, libXi, libXt -, libXft, libXinerama, libXrandr, libXxf86vm, libGL, libGLU, gle -, gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam -, systemd, coreutils +{ lib +, stdenv +, fetchurl +, coreutils +, gdk-pixbuf +, gdk-pixbuf-xlib +, gettext +, gle +, gtk3 +, intltool +, libGL +, libGLU +, libX11 +, libXext +, libXft +, libXi +, libXinerama +, libXrandr +, libXt +, libXxf86vm +, libxml2 +, makeWrapper +, pam +, perlPackages +, pkg-config +, systemd , forceInstallAllHacks ? false , withSystemd ? stdenv.isLinux }: -stdenv.mkDerivation rec { - version = "6.04"; +stdenv.mkDerivation (finalAttrs: { pname = "xscreensaver"; + version = "6.06"; src = fetchurl { - url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-eHAUsp8MV5Pswtk+EQmgSf9IqwwpuFHas09oPO72sVI="; + url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz"; + hash = "sha256-9TT6uFqDbeW4vo6R/CG4DKfWpO2ThuviB9S+ek50mac="; }; nativeBuildInputs = [ - pkg-config intltool makeWrapper + intltool + makeWrapper + pkg-config ]; buildInputs = [ - perl gettext libX11 libXext libXi libXt - libXft libXinerama libXrandr libXxf86vm libGL libGLU gle - gtk2 gdk-pixbuf gdk-pixbuf-xlib libxml2 pam - perlPackages.LWPProtocolHttps perlPackages.MozillaCA - ] ++ lib.optional withSystemd systemd; + gdk-pixbuf + gdk-pixbuf-xlib + gettext + gle + gtk3 + libGL + libGLU + libX11 + libXext + libXft + libXi + libXinerama + libXrandr + libXt + libXxf86vm + libxml2 + pam + perlPackages.LWPProtocolHttps + perlPackages.MozillaCA + perlPackages.perl + ] + ++ lib.optional withSystemd systemd; preConfigure = '' # Fix installation paths for GTK resources. @@ -45,10 +84,11 @@ stdenv.mkDerivation rec { for bin in $out/bin/*; do wrapProgram "$bin" \ --prefix PATH : "$out/libexec/xscreensaver" \ - --prefix PATH : "${lib.makeBinPath [ coreutils perl ]}" \ + --prefix PATH : "${lib.makeBinPath [ coreutils perlPackages.perl ]}" \ --prefix PERL5LIB ':' $PERL5LIB done - '' + lib.optionalString forceInstallAllHacks '' + '' + + lib.optionalString forceInstallAllHacks '' make -j$NIX_BUILD_CORES -C hacks/glx dnalogo cat hacks/Makefile.in \ | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks @@ -60,9 +100,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.unix; # Once had cygwin problems downloadPage = "https://www.jwz.org/xscreensaver/download.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) |