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

libvncserver: reduce dependencies; only use systemd on linux #33652

Merged
merged 1 commit into from Jan 15, 2018
Merged

libvncserver: reduce dependencies; only use systemd on linux #33652

merged 1 commit into from Jan 15, 2018

Conversation

thefloweringash
Copy link
Member

Motivation for this change

I wanted to use this library on macOS. While I was removing the linux-specific assertions I noticed a lot of seemingly unused dependencies, and removed them.

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.

@7c6f434c
Copy link
Member

@GrahamcOfBorg build x11vnc

@@ -32,11 +25,12 @@ stdenv.mkDerivation {
preConfigure = ''
sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure
'';
propagatedBuildInputs = [ zlib ];
Copy link
Member

Choose a reason for hiding this comment

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

If you are making zlib propagated, then it is not needed in normal buildInputs. And if you are splitting buildInputs already, autoreconfHook and pkgconfig are native (i.e. executed in the build-time), nowadays after all the cross-compilation work these go into nativeBuildInputs.

@7c6f434c
Copy link
Member

Thanks, looks nice in general.

@thefloweringash
Copy link
Member Author

Thanks for the review. Updated build inputs.

@7c6f434c
Copy link
Member

@GrahamcOfBorg build x11vnc

@7c6f434c
Copy link
Member

(I am not sure how the bot reacts to command-then-update, it should ignore the command in such a case)

@thefloweringash
Copy link
Member Author

x11vnc seems to be from the same project, but the x11vnc package in nixpkgs doesn't presently use libvncserver from nixpkgs as a dependency.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux


  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100 16336  100 16336    0     0  16336      0  0:00:01 --:--:--  0:00:01  443k

fetching path ‘/nix/store/gh638c8nq26s3lpbgvk4clvwhh5xl35k-x11vnc-0.9.13’...

*** Downloading ‘https://nix-cache.s3.amazonaws.com/nar/0d1b3mc8k21ksf3w7ql86zbybz4jcm187zg7k6jg4bc61cq9jsrx.nar.xz’ (signed by ‘cache.nixos.org-1’) to ‘/nix/store/gh638c8nq26s3lpbgvk4clvwhh5xl35k-x11vnc-0.9.13’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100 1075k  100 1075k    0     0  1075k      0  0:00:01 --:--:--  0:00:01 6439k

/nix/store/gh638c8nq26s3lpbgvk4clvwhh5xl35k-x11vnc-0.9.13

@7c6f434c
Copy link
Member

Ah right.

@7c6f434c
Copy link
Member

@GrahamcOfBorg build aqemu

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

Package ‘x11vnc-0.9.13’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/tools/X11/x11vnc/default.nix:30 is not supported on ‘x86_64-darwin’, 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.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

Package ‘aqemu-0.9.2’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/applications/virtualization/aqemu/default.nix:20 is not supported on ‘x86_64-darwin’, 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.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

copying path '/nix/store/2w45575p6lhwpaw7s18347h7y6706hw4-libXxf86vm-1.1.4' from 'https://cache.nixos.org'...
copying path '/nix/store/h8w2r13h0gmyadq7k33qij67r30v4c0z-libXdamage-1.1.4' from 'https://cache.nixos.org'...
copying path '/nix/store/3iilfwjmsqqc1fwa74qx628x5pmqpsdd-libXxf86misc-1.0.3' from 'https://cache.nixos.org'...
copying path '/nix/store/j5mjz0l7mdw152n0xy7d4a7m1qp6q0cs-libXtst-1.2.3' from 'https://cache.nixos.org'...
copying path '/nix/store/jc1qipkqxhjpwrn1a1gjc90zccgng5m0-libXrandr-1.5.1' from 'https://cache.nixos.org'...
copying path '/nix/store/ci0s6xbragj78x5jgbi6xf564p4b1c1l-libdmx-1.1.3' from 'https://cache.nixos.org'...
copying path '/nix/store/bs36kz802wwh2swig3wqd4fcnx30isv1-libXxf86dga-1.1.4' from 'https://cache.nixos.org'...
copying path '/nix/store/bf4i542ff29a95dj7gvnpn6qqnqzhcbq-xdpyinfo-1.3.2' from 'https://cache.nixos.org'...
copying path '/nix/store/xhx5mj7ly5knkil0zn157pssrm0mwi4a-x11vnc-0.9.13' from 'https://cache.nixos.org'...
/nix/store/xhx5mj7ly5knkil0zn157pssrm0mwi4a-x11vnc-0.9.13

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

shrinking RPATHs of ELF executables and libraries in /nix/store/l45f1lqdx8zgda5hb6n9zzk6sx7777zl-aqemu-0.9.2
shrinking /nix/store/l45f1lqdx8zgda5hb6n9zzk6sx7777zl-aqemu-0.9.2/bin/aqemu
gzipping man pages under /nix/store/l45f1lqdx8zgda5hb6n9zzk6sx7777zl-aqemu-0.9.2/share/man/
strip is /nix/store/wxn5gn8amxm1w0ikcx4gbs8a17wvss4j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/l45f1lqdx8zgda5hb6n9zzk6sx7777zl-aqemu-0.9.2/bin 
patching script interpreter paths in /nix/store/l45f1lqdx8zgda5hb6n9zzk6sx7777zl-aqemu-0.9.2
checking for references to /tmp/nix-build-aqemu-0.9.2.drv-0 in /nix/store/l45f1lqdx8zgda5hb6n9zzk6sx7777zl-aqemu-0.9.2...
postPatchMkspecs
postMoveQtStaticLibs
/nix/store/l45f1lqdx8zgda5hb6n9zzk6sx7777zl-aqemu-0.9.2

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

shrinking RPATHs of ELF executables and libraries in /nix/store/h2rxbc3rndzi0j60k6578cbfxlryffc4-aqemu-0.9.2
shrinking /nix/store/h2rxbc3rndzi0j60k6578cbfxlryffc4-aqemu-0.9.2/bin/aqemu
gzipping man pages under /nix/store/h2rxbc3rndzi0j60k6578cbfxlryffc4-aqemu-0.9.2/share/man/
strip is /nix/store/c6qj0j45xizkrx58i65j75a5ysmqhgrs-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/h2rxbc3rndzi0j60k6578cbfxlryffc4-aqemu-0.9.2/bin
patching script interpreter paths in /nix/store/h2rxbc3rndzi0j60k6578cbfxlryffc4-aqemu-0.9.2
checking for references to /build in /nix/store/h2rxbc3rndzi0j60k6578cbfxlryffc4-aqemu-0.9.2...
postPatchMkspecs
postMoveQtStaticLibs
/nix/store/h2rxbc3rndzi0j60k6578cbfxlryffc4-aqemu-0.9.2

@7c6f434c 7c6f434c merged commit ffb383e into NixOS:master Jan 15, 2018
@7c6f434c
Copy link
Member

OK, thanks

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

Successfully merging this pull request may close these issues.

None yet

4 participants