diff options
| author | Azat Bahawi <azat@bahawi.net> | 2022-06-05 22:12:24 +0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-06-23 21:13:53 +0000 |
| commit | c47cd973b68f9571ea3232db8e788a557a18575a (patch) | |
| tree | 6047fad97a08d0ed3d695c0c674fa8ebf662f80c | |
| parent | Merge pull request #178745 from NixOS/backport-178709-to-release-22.05 (diff) | |
| download | nixpkgs-origin/backport-175287-to-release-22.05.tar.gz | |
rss-glx: fix buildorigin/backport-175287-to-release-22.05
(cherry picked from commit 8b501a1089c346ea6efcddd6de18015512467493)
| -rw-r--r-- | pkgs/misc/screensavers/rss-glx/cstddef.patch | 12 | ||||
| -rw-r--r-- | pkgs/misc/screensavers/rss-glx/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 31 insertions, 3 deletions
diff --git a/pkgs/misc/screensavers/rss-glx/cstddef.patch b/pkgs/misc/screensavers/rss-glx/cstddef.patch new file mode 100644 index 000000000000..8bec510b0405 --- /dev/null +++ b/pkgs/misc/screensavers/rss-glx/cstddef.patch @@ -0,0 +1,12 @@ +diff --git i/src/Implicit/impSurface.h w/src/Implicit/impSurface.h +index 41fab81..027587f 100644 +--- i/src/Implicit/impSurface.h ++++ w/src/Implicit/impSurface.h +@@ -25,6 +25,7 @@ + #ifdef WIN32 + #include <windows.h> + #endif ++#include <cstddef> + #include <vector> + #include <GL/gl.h> + diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 981db782c7c9..a90b5d65653e 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,16 @@ -{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick6, libtiff, bzip2}: +{ lib +, stdenv +, fetchurl +, autoconf +, pkg-config +, xlibsWrapper +, libXext +, libGLU +, libGL +, imagemagick6 +, libtiff +, bzip2 +}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -9,9 +21,13 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ libGLU libGL xlibsWrapper imagemagick6 libtiff bzip2 ]; + patches = [ + ./cstddef.patch + ]; + NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e6e80c2b433..dcb2ce627f8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34544,7 +34544,7 @@ with pkgs; stdenv = gccStdenv; }; - rss-glx = callPackage ../misc/screensavers/rss-glx { stdenv = gcc10StdenvCompat; }; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; run-scaled = callPackage ../tools/X11/run-scaled { }; |