treewide: remove issue #56943 workarounds by Artturin · Pull Request #215715 · NixOS/nixpkgs

Artturin · 2023-02-10T18:51:43Z

checked with diffoscope+difflog and launching the programs

i have fixed that issue in my other gir PRs###### Description of changes

Things done

pkgs/applications/graphics/curtail/default.nix

pkgs/development/tools/cambalache/default.nix

pkgs/tools/inputmethods/input-remapper/default.nix

checked with diffoscope+difflog and launching the programs i have fixed that issue in my other gir PRs

and fix double wrapping it still fails to launch though but its not a regression $ ./result/bin/dogtail-logout Traceback (most recent call last): File "/nix/store/az8mw2pmhbwlm08176wd62hn0hfzwv8s-python3.10-dogtail-0.9.11/bin/.dogtail-logout-wrapped", line 8, in <module> from dogtail.tree import * File "/nix/store/az8mw2pmhbwlm08176wd62hn0hfzwv8s-python3.10-dogtail-0.9.11/lib/python3.10/site-packages/dogtail/tree.py", line 5, in <module> from dogtail import predicate File "/nix/store/az8mw2pmhbwlm08176wd62hn0hfzwv8s-python3.10-dogtail-0.9.11/lib/python3.10/site-packages/dogtail/predicate.py", line 6, in <module> from gi.repository import GLib ModuleNotFoundError: No module named 'gi'

pygobject3 has to be propagated for the import line in the python file in bin $ ./result/bin/curtail Traceback (most recent call last): File "/nix/store/fqjld9nchfwqd9x1pywmjfdsqrk4lxds-curtail-1.3.1/bin/.curtail-wrapped", line 37, in <module> import gi ModuleNotFoundError: No module named 'gi'

jtojnar

Looks good, thanks.

jtojnar · 2023-02-17T19:03:41Z

Actually, we might want to add some tests to https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix

Artturin · 2023-02-17T19:10:20Z

Actually, we might want to add some tests to master/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix

already did for gdk-pixbuf in https://github.com/NixOS/nixpkgs/pull/208537/files#diff-fa727d655e0d18c0ba8bb953613ed08fb7853f04b226341ee2fe6b17957cf523R74

for gobject-introspection there's already typelib-x tests written by you

jtojnar · 2023-02-17T19:12:31Z

Those do not have strictDeps = true, though?

Artturin · 2023-02-17T19:15:10Z

Those do not have strictDeps = true, though?

NixOS/nixpkgs@8be7ab6 (#208537)

run tests with strictDeps

the ones using testLib.runTest are using strictDeps

EDIT disregard, they're testing the package which was not built with strictDeps, i'll add strictDeps

luckily the lib output does not contain binaries therefore its safe to remove it from propagatedBuildInputs

'nix build -f . "wrapGAppsHook.tests"' pass

Artturin · 2023-02-17T19:37:19Z

alright strictDeps enabled and dconf.lib moved to depsTargetTargetPropagated

for typelibs and girs

Artturin · 2023-02-17T23:03:05Z

nix build -f . "pkgsCross.aarch64-multiplatform.wrapGAppsHook.tests" --keep-going passes other than

basic-contains-gdk-pixbuf> FAIL: basic-contains-gdk-pixbuf: The file “/nix/store/faxhx93d6qvizzwnw2g548pzj5sxmrwn-basic-aarch64-unknown-linux-gnu/bin/foo” should include a line containing “GDK_PIXBUF_MODULE_FILE” that also contains “/nix/store/sir0dnzpqpfl1fmx2lpv2lwjcvy17dzc-librsvg-aarch64-unknown-linux-gnu-2.55.1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache”.

due to

nixpkgs/pkgs/development/libraries/librsvg/default.nix

Lines 121 to 126 in 2ea8b00

    
             # Not generated when cross compiling. 
        
             postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' 
        
               # Merge gdkpixbuf and librsvg loaders 
        
               cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp 
        
               mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache 
        
             '';

jtojnar · 2023-02-17T23:31:41Z

Would not it make more sense to keep the test failing until it is properly fixed (e.g. using emulator to generate the loaders), rather than mask the broken runtime behaviour?

… buildPackages

Artturin · 2023-02-18T05:37:26Z

Would not it make more sense to keep the test failing until it is properly fixed (e.g. using emulator to generate the loaders), rather than mask the broken runtime behaviour?

fixed it

jtojnar

Great job.

lilyinstarlight · 2023-07-29T23:30:36Z

pkgs/development/libraries/librsvg/default.nix


  # Not generated when cross compiling.
-  postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ''


After this PR, I also need to add this diff for librsvg to build with cross again:

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 9974826573a..87ddcd28403 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -147,11 +147,11 @@ stdenv.mkDerivation (finalAttrs: { mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache mkdir -p "$out/share/bash-completion/completions/" - $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" + ${stdenv.hostPlatform.emulator buildPackages} $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" mkdir -p "$out/share/zsh/site-functions/" - $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" + ${stdenv.hostPlatform.emulator buildPackages} $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" mkdir -p "$out/share/fish/vendor_completions.d/" - $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" + ${stdenv.hostPlatform.emulator buildPackages} $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" ''; postFixup = lib.optionalString withIntrospection ''

Is this the correct approach for fixing that?

If so, I'll open a PR to fix librsvg cross (I'll probably use a let rsvg-convert = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/rsvg-convert" in ... to shorten it a little, though)

We already have that on staging: #244602

Ah, thanks! I did a quick search but missed that. Sorry for the noise 😅

Artturin requested review from FRidh, jonringer and jtojnar as code owners February 10, 2023 18:51

Artturin mentioned this pull request Feb 10, 2023

treewide: remove issue #56943 workarounds #208268

Closed

13 tasks

github-actions bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: xfce The Xfce Desktop Environment 8.has: documentation This PR adds or changes documentation labels Feb 10, 2023

ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Feb 10, 2023

SuperSandro2000 approved these changes Feb 10, 2023

View reviewed changes

jtojnar reviewed Feb 11, 2023

View reviewed changes

pkgs/applications/graphics/curtail/default.nix Show resolved Hide resolved

jtojnar reviewed Feb 11, 2023

View reviewed changes

pkgs/development/tools/cambalache/default.nix Outdated Show resolved Hide resolved

jtojnar reviewed Feb 11, 2023

View reviewed changes

pkgs/tools/inputmethods/input-remapper/default.nix Show resolved Hide resolved

Artturin force-pushed the removegirworkarounds2 branch 4 times, most recently from e7be096 to fc9640a Compare February 17, 2023 18:24

Artturin added 3 commits February 17, 2023 20:26

treewide: remove issue NixOS#56943 workarounds

cadffcf

checked with diffoscope+difflog and launching the programs i have fixed that issue in my other gir PRs

Artturin force-pushed the removegirworkarounds2 branch from fc9640a to ab3ba31 Compare February 17, 2023 18:26

jtojnar approved these changes Feb 17, 2023

View reviewed changes

Artturin added 2 commits February 17, 2023 21:32

wrapGAppsHook: move dconf.lib to depsTargetTargetPropagated

c4e7fb1

luckily the lib output does not contain binaries therefore its safe to remove it from propagatedBuildInputs

wrapGAppsHook: run tests with strictDeps

2168611

'nix build -f . "wrapGAppsHook.tests"' pass

Artturin requested a review from Ericson2314 as a code owner February 17, 2023 19:37

wrapGAppsHook: add gtk3 to depsTargetTargetPropagated

2c471e6

for typelibs and girs

Artturin requested a review from jtojnar February 17, 2023 23:03

ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels Feb 17, 2023

Artturin added 2 commits February 18, 2023 07:35

librsvg: withIntrospection when stdenv.hostPlatform.emulatorAvailable…

7637168

… buildPackages

librsvg: create loaders.cache even when cross-compiling

d5b6b62

Artturin force-pushed the removegirworkarounds2 branch from e04770b to d5b6b62 Compare February 18, 2023 05:37

jtojnar approved these changes Feb 18, 2023

View reviewed changes

Artturin merged commit cdcca1c into NixOS:staging Feb 18, 2023

Artturin deleted the removegirworkarounds2 branch February 18, 2023 18:12

lilyinstarlight reviewed Jul 29, 2023

View reviewed changes

Uh oh!

Comments

Conversation

Artturin commented Feb 10, 2023

Things done

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jtojnar left a comment

Choose a reason for hiding this comment

Uh oh!

jtojnar commented Feb 17, 2023

Uh oh!

Artturin commented Feb 17, 2023

Uh oh!

jtojnar commented Feb 17, 2023

Uh oh!

Artturin commented Feb 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Artturin commented Feb 17, 2023

Uh oh!

Artturin commented Feb 17, 2023

Uh oh!

jtojnar commented Feb 17, 2023

Uh oh!

Artturin commented Feb 18, 2023

Uh oh!

jtojnar left a comment

Choose a reason for hiding this comment

Uh oh!

lilyinstarlight Jul 29, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jtojnar Jul 29, 2023

Choose a reason for hiding this comment

Uh oh!

lilyinstarlight Jul 29, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Artturin commented Feb 17, 2023 •

edited

Loading

lilyinstarlight Jul 29, 2023 •

edited

Loading