gdk-pixbuf: move xlib into separate package #88086
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* format with nixpkgs-fmt * reorder the attributes * replace aliases * inline pname & version * add GNOME maintainers * update homepage from devdocs to repo
It is deprecated and will be removed: https://mail.gnome.org/archives/desktop-devel-list/2019-November/msg00009.html Until then, you can use gdk-pixbuf-xlib package.
ofborg
bot
added
6.topic: emacs
6.topic: GNOME
|
I suggest we merge this and look for breakage in the next staging cycle. There should not be too many packages depending on this. |
ofborg
bot
removed
6.topic: emacs
6.topic: GNOME
|
@GrahamcOfBorg eval |
This was referenced Jun 1, 2020
|
Uh, --- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, gettext, perl, asciidoc
, libjpeg, libtiff, libungif, libpng, imlib, expat
-, freetype, fontconfig, pkgconfig, gdk-pixbuf
+, freetype, fontconfig, pkgconfig, gdk-pixbuf, gdk-pixbuf-xlib, glib
, mkfontdir, libX11, libXft, libXext, libXinerama
, libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb
, libpthreadstubs, pcre, libXdamage, libXcomposite, libXfixes
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gettext libjpeg libtiff libungif libpng imlib expat
- freetype fontconfig gdk-pixbuf mkfontdir libX11
+ freetype fontconfig gdk-pixbuf gdk-pixbuf-xlib glib mkfontdir libX11
libXft libXext libXinerama libXrandr libICE libSM libXpm
libXdmcp libxcb libpthreadstubs pcre libsndfile fribidi
libXdamage libXcomposite libXfixes
@@ -30,6 +30,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" ];
+ NIX_CFLAGS_COMPILE = [
+ "-I${stdenv.lib.getDev gdk-pixbuf-xlib}/include/gdk-pixbuf-2.0"
+ "-I${stdenv.lib.getDev gdk-pixbuf }/include/gdk-pixbuf-2.0"
+ "-I${stdenv.lib.getDev glib }/include/glib-2.0"
+ ];
+
# install legacy themes
postInstall = ''
cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} $out/share/icewm/themes/ |
|
It was an issue with the split-out library. Fixed in 4bb1995. |
|
Thanks! I was surprised at first, then I noticed the parent commit :-) |
10 tasks
ryneeverett
added a commit
to ryneeverett/nixpkgs
that referenced
this pull request
Sep 9, 2020
The build has been broken since gdk-pixbuf-xlib was broken out into a separate package in NixOS#88086. For some reason if I just add gdk-pixbuf-xlib.dev the headers don't make it into CFLAGS.
ryneeverett
added a commit
to ryneeverett/nixpkgs
that referenced
this pull request
Sep 10, 2020
The build has been broken since gdk-pixbuf-xlib was broken out into a separate package in NixOS#88086. For some reason if I just add gdk-pixbuf-xlib.dev the headers don't make it into CFLAGS. (cherry picked from commit 5b49a74)
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
gdk-pixbuf-xlib library is deprecated and will be removed:
https://mail.gnome.org/archives/desktop-devel-list/2019-November/msg00009.html
#74272
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)