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.

Sign up for GitHub

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

Jump to bottom

gtk3: add x11Support for darwin #44630

Merged

LnL7 merged 3 commits into NixOS:master from LnL7:darwin-gtk-x11

Aug 18, 2018

Member

LnL7 commented Aug 7, 2018

Motivation for this change

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
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 nox --run "nox-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)
Fits CONTRIBUTING.md.

GrahamcOfBorg added the 6.topic: darwin label

matthewbauer reviewed

View reviewed changes

pkgs/top-level/all-packages.nix Outdated

    
                  inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;

                };

                gtk3-x11 = gtk3.override {

Member

matthewbauer Aug 7, 2018

Without a use case, I don't think we need to add this here. Packages depending on GTK shouldn't care what backend it has.

Member Author

LnL7 Aug 18, 2018

Well vim fails without x11 and this hurts discoverability, I only knew about this because nix-locate found a header in gtk2-x11. But I removed it for now.

matthewbauer reviewed

View reviewed changes

pkgs/development/libraries/gtk+/3.x.nix

    
            @@ -36,12 +37,12 @@ stdenv.mkDerivation rec {
          
                  })

                ];

                buildInputs = [ libxkbcommon epoxy json-glib ];

                buildInputs = [ libxkbcommon epoxy json-glib ]

                  ++ optionals stdenv.isDarwin [ AppKit Cocoa ];

Member

matthewbauer Aug 7, 2018

Do you need this with x11? We might want something like withQuartz or similar to provide here.

Member

matthewbauer Aug 19, 2018

This should probably be propagated here. Looks like it's causing newly failing:

https://hydra.nixos.org/eval/1474251#tabs-now-fail

Member Author

LnL7 Aug 19, 2018

My bad, I forgot that didn't test the dependent packages yet. Because frameworks are impure they shouldn't be propagated unless there's a good reason to do so. Which is only Cocoa in this case. 90b9916...ac95ddb

GrahamcOfBorg added 8.has: package (new) 10.rebuild-darwin: 101-500 10.rebuild-linux: 1-10 labels

GrahamcOfBorg commented Aug 7, 2018

Success on x86_64-linux (full log)

Attempted: at-spi2-atk, at-spi2-core, gtk3

Partial log (click to expand)

  /nix/store/9s7zm3x5gfz5141i714pgpkzlbg9yg5k-at-spi2-atk-2.26.2
  /nix/store/f4myj2j6j6lyjsgqymnnb8z7yh7zzw43-gtk+3-3.22.30
  /nix/store/nx5krv0r0hb83yhxdn3l2kfiazl7cmi1-at-spi2-core-2.28.0
copying path '/nix/store/nx5krv0r0hb83yhxdn3l2kfiazl7cmi1-at-spi2-core-2.28.0' from 'https://cache.nixos.org'...
copying path '/nix/store/1wvpi975fywyxmn7m1gjhzq36l2xb0xp-epoxy-1.5.1' from 'https://cache.nixos.org'...
copying path '/nix/store/9s7zm3x5gfz5141i714pgpkzlbg9yg5k-at-spi2-atk-2.26.2' from 'https://cache.nixos.org'...
copying path '/nix/store/f4myj2j6j6lyjsgqymnnb8z7yh7zzw43-gtk+3-3.22.30' from 'https://cache.nixos.org'...
/nix/store/9s7zm3x5gfz5141i714pgpkzlbg9yg5k-at-spi2-atk-2.26.2
/nix/store/nx5krv0r0hb83yhxdn3l2kfiazl7cmi1-at-spi2-core-2.28.0
/nix/store/f4myj2j6j6lyjsgqymnnb8z7yh7zzw43-gtk+3-3.22.30

GrahamcOfBorg commented Aug 7, 2018

Success on aarch64-linux (full log)

Attempted: at-spi2-atk, at-spi2-core, gtk3

Partial log (click to expand)

/nix/store/f60yf7jiw9l7y1xp2g44msd5gwcr8bpb-at-spi2-atk-2.26.2
/nix/store/swpmdrgmi57rkjcy6n25yh27knf6p9jm-at-spi2-core-2.28.0
/nix/store/dgxrh29v77wbshlla101yv3lmlhbsxmc-gtk+3-3.22.30

GrahamcOfBorg commented Aug 7, 2018

Success on x86_64-darwin (full log)

Attempted: at-spi2-atk, at-spi2-core, gtk3

Partial log (click to expand)

/nix/store/fc7xsxpb2756bg8v6n92mss6i5kg1692-gtk+3-3.22.30/lib/libgtk-3.0.dylib: fixing dylib
/nix/store/fc7xsxpb2756bg8v6n92mss6i5kg1692-gtk+3-3.22.30/lib/libgailutil-3.0.dylib: fixing dylib
/nix/store/fc7xsxpb2756bg8v6n92mss6i5kg1692-gtk+3-3.22.30/lib/libgdk-3.0.dylib: fixing dylib
/nix/store/fc7xsxpb2756bg8v6n92mss6i5kg1692-gtk+3-3.22.30/lib/libgtk-3.0.dylib: fixing dylib
/nix/store/fc7xsxpb2756bg8v6n92mss6i5kg1692-gtk+3-3.22.30/lib/libgailutil-3.0.dylib: fixing dylib
/nix/store/fc7xsxpb2756bg8v6n92mss6i5kg1692-gtk+3-3.22.30/lib/libgdk-3.0.dylib: fixing dylib
gzipping man pages under /nix/store/bk06il886926g74jr0zxzh0zrn6cklps-gtk+3-3.22.30-dev/share/man/
strip is /nix/store/qfxcr8c4fg7lkybrny9n2sb77bmippdx-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/bk06il886926g74jr0zxzh0zrn6cklps-gtk+3-3.22.30-dev/lib  /nix/store/bk06il886926g74jr0zxzh0zrn6cklps-gtk+3-3.22.30-dev/bin
patching script interpreter paths in /nix/store/bk06il886926g74jr0zxzh0zrn6cklps-gtk+3-3.22.30-dev

LnL7 added 3 commits

August 18, 2018 21:37


          gtk3: add x11Support for darwin


          at-spi2-atk: fix darwin dylib install_name

a71a9ea


          at-spi2-core: fix darwin dylib install_name

abe2ab1

LnL7 force-pushed the darwin-gtk-x11 branch from 3b34b07 to abe2ab1 Compare

August 18, 2018 19:37

GrahamcOfBorg added 10.rebuild-linux: 0 and removed 10.rebuild-linux: 1-10 labels

GrahamcOfBorg commented Aug 18, 2018

Success on aarch64-linux (full log)

Attempted: at-spi2-atk, at-spi2-core, gtk3

Partial log (click to expand)

/nix/store/dbgkqn3wiz70wrarb22hm1kj1g21r5kj-at-spi2-atk-2.26.2
/nix/store/ismg9pnldzisg9cizb436fi2zn90d722-at-spi2-core-2.28.0
/nix/store/gb4sbsphac6vdaxiwc3qhqlf8d4xbpg6-gtk+3-3.22.30

GrahamcOfBorg commented Aug 18, 2018

Success on x86_64-linux (full log)

Attempted: at-spi2-atk, at-spi2-core, gtk3

Partial log (click to expand)

/nix/store/v2waxiicrphvmlxpl96mcqi2r6cdq5vs-at-spi2-atk-2.26.2
/nix/store/dsczb9kb49050ks6mlf6llinpsdqq43i-at-spi2-core-2.28.0
/nix/store/m495mwzv6g89qin43ib6s3g5vpl5qfh5-gtk+3-3.22.30

LnL7 merged commit 0ad3721 into NixOS:master

LnL7 deleted the darwin-gtk-x11 branch

August 18, 2018 20:14

GrahamcOfBorg commented Aug 18, 2018

Success on x86_64-darwin (full log)

Attempted: at-spi2-atk, at-spi2-core, gtk3

Partial log (click to expand)

/nix/store/v47zh8gbznydn527i220j89sh87ldr0p-gtk+3-3.22.30/lib/libgailutil-3.0.dylib: fixing dylib
/nix/store/v47zh8gbznydn527i220j89sh87ldr0p-gtk+3-3.22.30/lib/libgdk-3.0.dylib: fixing dylib
/nix/store/v47zh8gbznydn527i220j89sh87ldr0p-gtk+3-3.22.30/lib/libgtk-3.0.dylib: fixing dylib
/nix/store/v47zh8gbznydn527i220j89sh87ldr0p-gtk+3-3.22.30/lib/libgailutil-3.0.dylib: fixing dylib
/nix/store/v47zh8gbznydn527i220j89sh87ldr0p-gtk+3-3.22.30/lib/libgdk-3.0.dylib: fixing dylib
/nix/store/v47zh8gbznydn527i220j89sh87ldr0p-gtk+3-3.22.30/lib/libgtk-3.0.dylib: fixing dylib
gzipping man pages under /nix/store/hn5wz8n55c56m0kicd89lrmcrx1qmk42-gtk+3-3.22.30-dev/share/man/
strip is /nix/store/bg39mxc401qqxgjasxfgardi6xl2ikmc-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/hn5wz8n55c56m0kicd89lrmcrx1qmk42-gtk+3-3.22.30-dev/lib  /nix/store/hn5wz8n55c56m0kicd89lrmcrx1qmk42-gtk+3-3.22.30-dev/bin
patching script interpreter paths in /nix/store/hn5wz8n55c56m0kicd89lrmcrx1qmk42-gtk+3-3.22.30-dev

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