public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-02-27 18:16:44 +00:00
committed by GitHub
parent deaba707eb 6e387b7d59
commit 5267db2989
45 changed files with 550 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/screensavers/rss-glx/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}:
{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick6, libtiff, bzip2}:
stdenv.mkDerivation rec {
version = "0.9.1";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libGLU libGL xlibsWrapper imagemagick libtiff bzip2 ];
buildInputs = [ libGLU libGL xlibsWrapper imagemagick6 libtiff bzip2 ];
NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick";
NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick";
NIX_LDFLAGS= "-rpath ${libXext}/lib";
meta = {