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.

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

zathura: make compatible with darwin #34973

Merged
merged 2 commits into from Feb 15, 2018
Merged

zathura: make compatible with darwin #34973

merged 2 commits into from Feb 15, 2018

Conversation

pallavagarwal07
Copy link
Contributor

Motivation for this change

I wanted to use zathura on Mac.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@LnL7
Copy link
Member

LnL7 commented Feb 15, 2018

@GrahamcOfBorg build zathura

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Feb 15, 2018
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

Package ‘gtk-mac-integration-2.0.8’ in /var/lib/gc-of-borg/nix-test-rs-1/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-1/pkgs/development/libraries/gtk-mac-integration/default.nix:22 is not supported on ‘aarch64-linux’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

Package ‘gtk-mac-integration-2.0.8’ in /home/borg/borg-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/7c6f434c-buildbox/pkgs/development/libraries/gtk-mac-integration/default.nix:22 is not supported on ‘x86_64-linux’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

LnL7
LnL7 suggested changes Feb 15, 2018
View reviewed changes
pkgs/applications/misc/zathura/pdf-mupdf/default.nix Outdated

buildInputs = [
zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg
gtk-mac-integration
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you missed an optional

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

/nix/store/cmc6plgaf5jacnraizmn0kkvym0yga17-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/cmc6plgaf5jacnraizmn0kkvym0yga17-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/cmc6plgaf5jacnraizmn0kkvym0yga17-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/cmc6plgaf5jacnraizmn0kkvym0yga17-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/cmc6plgaf5jacnraizmn0kkvym0yga17-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/cmc6plgaf5jacnraizmn0kkvym0yga17-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/cmc6plgaf5jacnraizmn0kkvym0yga17-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/cmc6plgaf5jacnraizmn0kkvym0yga17-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
building '/nix/store/aqd524g1iv4apv6jfm0vj7wdb9mhrmjc-zathura-with-plugins-0.3.8.drv'...
/nix/store/r3msc34hv9779gxpy0qbdph6k84pnpzd-zathura-with-plugins-0.3.8

LnL7
LnL7 reviewed Feb 15, 2018
View reviewed changes
pkgs/applications/misc/zathura/djvu/default.nix Outdated
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {

patches = [ ./gtkflags.patch ];

patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the patchPhase override here intentional? This disables the gtkflags.patch, either way it's better to make that explicit and use prePatch/postPatch for extra substitutions like this.

@pallavagarwal07
Copy link
Contributor Author

@LnL7 Done

@GrahamcOfBorg GrahamcOfBorg removed the 6.topic: darwin Running or building packages on Darwin label Feb 15, 2018
@Mic92
Copy link
Member

Mic92 commented Feb 15, 2018

@GrahamcOfBorg build zathura

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/6i3v670rprb4q58l7zfk8qsijwcin1bs-zathura-pdf-mupdf-0.3.2
shrinking /nix/store/6i3v670rprb4q58l7zfk8qsijwcin1bs-zathura-pdf-mupdf-0.3.2/lib/pdf.so
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/6i3v670rprb4q58l7zfk8qsijwcin1bs-zathura-pdf-mupdf-0.3.2/lib 
patching script interpreter paths in /nix/store/6i3v670rprb4q58l7zfk8qsijwcin1bs-zathura-pdf-mupdf-0.3.2
checking for references to /tmp/nix-build-zathura-pdf-mupdf-0.3.2.drv-0 in /nix/store/6i3v670rprb4q58l7zfk8qsijwcin1bs-zathura-pdf-mupdf-0.3.2...
building path(s) ‘/nix/store/bvs3aiww1xahidh4qfpm0wn8yd0hhwz5-zathura-with-plugins-0.3.8’
/nix/store/bvs3aiww1xahidh4qfpm0wn8yd0hhwz5-zathura-with-plugins-0.3.8

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

/nix/store/yq7b2drqacds4wblqkc4r8xrf8n9l5vm-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/yq7b2drqacds4wblqkc4r8xrf8n9l5vm-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/yq7b2drqacds4wblqkc4r8xrf8n9l5vm-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/yq7b2drqacds4wblqkc4r8xrf8n9l5vm-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/yq7b2drqacds4wblqkc4r8xrf8n9l5vm-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/yq7b2drqacds4wblqkc4r8xrf8n9l5vm-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/yq7b2drqacds4wblqkc4r8xrf8n9l5vm-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
/nix/store/yq7b2drqacds4wblqkc4r8xrf8n9l5vm-zathura-pdf-mupdf-0.3.2/lib/pdf.dylib: fixing dylib
building '/nix/store/l0hz2qrh2scbnp9xbz01w5agv4mc5q2n-zathura-with-plugins-0.3.8.drv'...
/nix/store/2j6b4ghv4nwm2w6jm3l354wqhp6wf9iv-zathura-with-plugins-0.3.8

@Mic92 Mic92 merged commit 4857b14 into NixOS:master Feb 15, 2018
@pallavagarwal07 pallavagarwal07 deleted the zathura branch February 15, 2018 10:30
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

   Compiling rustc_save_analysis v0.0.0 (file:///build/rustc-1.22.1-src/src/librustc_save_analysis)
   Compiling rustc_privacy v0.0.0 (file:///build/rustc-1.22.1-src/src/librustc_privacy)
   Compiling rustc_borrowck v0.0.0 (file:///build/rustc-1.22.1-src/src/librustc_borrowck)
building of '/nix/store/1vbyjba76gw7jcs9g5sqyb2bxsb0xpln-rustc-1.22.1.drv' timed out after 3200 seconds
cannot build derivation '/nix/store/wjjfbzq8gfxgbd3f426j8syljcqjdsk1-cargo-0.23.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/bvngc1qvckx0cm4lbcvjalnzi4bdy4dz-librsvg-2.42.2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/qz927n9xsvifj2lh5hmy0cx8pwhkh5fh-djvulibre-3.5.27.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/1d71rvq7ak5h3h136x12kgwlj2kmyipa-zathura-djvu-0.2.7.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/7mlrr1fqjq3y4llb0w3gdiczfj1m1gmd-zathura-with-plugins-0.3.8.drv': 1 dependencies couldn't be built
error: build of '/nix/store/7mlrr1fqjq3y4llb0w3gdiczfj1m1gmd-zathura-with-plugins-0.3.8.drv' failed

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

@LnL7 LnL7 LnL7 requested changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@pallavagarwal07 @LnL7 @GrahamcOfBorg @Mic92