diff options
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/autotiling/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/cups/default.nix | 1 | ||||
-rw-r--r-- | pkgs/misc/jitsi-meet-prosody/default.nix | 4 | ||||
-rwxr-xr-x | pkgs/misc/jitsi-meet-prosody/update.sh | 2 | ||||
-rw-r--r-- | pkgs/misc/screensavers/rss-glx/default.nix | 5 | ||||
-rw-r--r-- | pkgs/misc/screensavers/xautolock/default.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/screensavers/xtrlock-pam/default.nix | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index 0161790fcff8f..a24095759f025 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "autotiling"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-2zWuATgj92s3tPqvB4INPfucmJTWYmGBx12U10qXohw="; + sha256 = "sha256-4iiiiuXCHFXEeA99ikq/G3q2KXBZ7vwpfET7QtoDVds="; }; propagatedBuildInputs = [ i3ipc importlib-metadata ]; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index c30833937be87..c844dbffee404 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp ]; + configurePlatforms = lib.optionals stdenv.isLinux [ "build" "host" ]; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index abe7281c9d148..f8e57cf12a36e 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.6600"; + version = "1.0.6644"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "SrWkm+dXfBQmI9nownh7fRe6WXrF/x2GP0Guw7GmXOo="; + sha256 = "41jlcsJpcFlNdBIOAdzTUF3wOUAOS9upF/uxFQaGULc="; }; dontBuild = true; diff --git a/pkgs/misc/jitsi-meet-prosody/update.sh b/pkgs/misc/jitsi-meet-prosody/update.sh index bc039d1ba8e82..3c3695b1f6ada 100755 --- a/pkgs/misc/jitsi-meet-prosody/update.sh +++ b/pkgs/misc/jitsi-meet-prosody/update.sh @@ -6,7 +6,7 @@ set -eu -o pipefail version="$(curl https://download.jitsi.org/stable/ | \ pup 'a[href] text{}' | \ awk -F'[_-]' '/jitsi-meet-prosody/ {printf $4"\n"}' | \ - sort -u | \ + sort -Vu | \ tail -n 1)" update-source-version jitsi-meet-prosody "$version" diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index a90b5d65653e0..2bcb42e85ec5d 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -3,7 +3,7 @@ , fetchurl , autoconf , pkg-config -, xlibsWrapper +, libX11 , libXext , libGLU , libGL @@ -22,14 +22,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf pkg-config ]; - buildInputs = [ libGLU libGL xlibsWrapper imagemagick6 libtiff bzip2 ]; + buildInputs = [ libGLU libGL libX11 libXext imagemagick6 libtiff bzip2 ]; patches = [ ./cstddef.patch ]; NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick"; - NIX_LDFLAGS= "-rpath ${libXext}/lib"; meta = { description = "Really Slick Screensavers Port to GLX"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index cdb12b5546472..fc87290da69ae 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, xlibsWrapper -, imake, gccmakedep, libXScrnSaver, xorgproto +{ lib, stdenv, fetchFromGitHub +, imake, gccmakedep, libX11, libXext, libXScrnSaver, xorgproto }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ]; + buildInputs = [ libX11 libXext libXScrnSaver xorgproto ]; makeFlags = [ "BINDIR=$(out)/bin" diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 9159bfe075a95..b87374df14dfe 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, pkg-config, xlibsWrapper, pam }: +{ lib, stdenv, fetchFromGitHub, python2, pkg-config, pam, xorg }: stdenv.mkDerivation { pname = "xtrlock-pam"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python2 xlibsWrapper pam ]; + buildInputs = [ python2 pam xorg.libX11 ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h |