Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gdk-pixbuf: move xlib into separate package #88086

Merged
merged 3 commits into from May 25, 2020

Conversation

@jtojnar
Copy link
Contributor

jtojnar commented May 18, 2020

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
jtojnar added 3 commits May 18, 2020
* 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.
@jtojnar jtojnar changed the base branch from master to staging May 18, 2020
@jtojnar jtojnar changed the base branch from staging to master May 18, 2020
@jtojnar jtojnar changed the base branch from master to staging May 18, 2020
@jtojnar jtojnar added this to To do in Picking up garbage via automation May 18, 2020
@jtojnar jtojnar requested review from vcunat, hedning and worldofpeace May 18, 2020
@jtojnar jtojnar moved this from To do to In progress in Picking up garbage May 18, 2020
@ofborg ofborg bot requested a review from edolstra May 18, 2020
@jtojnar
Copy link
Contributor Author

jtojnar commented May 18, 2020

I suggest we merge this and look for breakage in the next staging cycle. There should not be too many packages depending on this.

Copy link
Contributor

hedning left a comment

Sounds good to me.

@jtojnar
Copy link
Contributor Author

jtojnar commented May 25, 2020

@ofborg ofborg bot requested a review from hedning May 25, 2020
@jtojnar jtojnar merged commit 38acc39 into NixOS:staging May 25, 2020
14 of 17 checks passed
14 of 17 checks passed
gdk-pixbuf, gdk-pixbuf-xlib, gdk-pixbuf-xlib.passthru.tests, gdk-pixbuf.passthru.tests on aarch64-linux
Details
gdk-pixbuf, gdk-pixbuf-xlib, gdk-pixbuf-xlib.passthru.tests, gdk-pixbuf.passthru.tests on x86_64-darwin
Details
gdk-pixbuf, gdk-pixbuf-xlib, gdk-pixbuf-xlib.passthru.tests, gdk-pixbuf.passthru.tests on x86_64-linux
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80a8900"; rev="80a89002f1ad1d89f8fe926b6ac6aefae169d5b4"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80a8900"; rev="80a89002f1ad1d89f8fe926b6ac6aefae169d5b4"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80a8900"; rev="80a89002f1ad1d89f8fe926b6ac6aefae169d5b4"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80a8900"; rev="80a89002f1ad1d89f8fe926b6ac6aefae169d5b4"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80a8900"; rev="80a89002f1ad1d89f8fe926b6ac6aefae169d5b4"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80a8900"; rev="80a89002f1ad1d89f8fe926b6ac6aefae169d5b4"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80a8900"; rev="80a89002f1ad1d89f8fe926b6ac6aefae169d5b4"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Picking up garbage automation moved this from In progress to Done May 25, 2020
@jtojnar jtojnar deleted the jtojnar:gdk-pixbuf-xlib-drop branch May 25, 2020
@vcunat
Copy link
Member

vcunat commented Jun 11, 2020

Uh, icewm build broke down completely (channel blocker). I only tried for a while so far, but apparently even multiple changes aren't enough

--- 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/
@jtojnar
Copy link
Contributor Author

jtojnar commented Jun 11, 2020

It was an issue with the split-out library. Fixed in 4bb1995.

@vcunat
Copy link
Member

vcunat commented Jun 11, 2020

Thanks! I was surprised at first, then I noticed the parent commit :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.