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

vogl: init at 2016-05-13 #24002

Merged
merged 1 commit into from Mar 26, 2017
Merged

vogl: init at 2016-05-13 #24002

merged 1 commit into from Mar 26, 2017

Conversation

deepfire
Copy link
Contributor

@deepfire deepfire commented Mar 18, 2017

Motivation for this change

Packaging https://github.com/ValveSoftware/vogl --

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
    • Linux (SteamOS)
  • 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.

--

Things work, modulo two issues:

@deepfire
Copy link
Contributor Author

This almost works on Nix/SteamOS. Haven't managed to make it reliable yet, though.

name = "vogl-${ver}";
version = "${ver}";

src = fetchgit {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should use fetchFromGitHub

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

makeQtWrapper pkgconfig
];

buildInputs = [
Copy link
Contributor

Choose a reason for hiding this comment

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

cmake also goes in nativeBuildInputs

description = "OpenGL capture / playback debugger.";
homepage = https://github.com/ValveSoftware/vogl;
license = licenses.bsd3;
maintainers = with maintainers; [ deepfire ];
Copy link
Contributor

Choose a reason for hiding this comment

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

If there is only one maintainer, should be maintainers = [ maintainers.deepfire ];

];

buildInputs = [
cmake git pkgconfig wget zip
Copy link
Contributor

Choose a reason for hiding this comment

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

pkgconfig is already in nativeBuildInputs, shouldn't be in buildInputs as well

@deepfire
Copy link
Contributor Author

@ndowens, updated my journal..

@ndowens
Copy link
Contributor

ndowens commented Mar 19, 2017

Currently qt5base is messed up atm, does qt4 work on this package?

@deepfire
Copy link
Contributor Author

deepfire commented Mar 19, 2017

@ndowens, no idea, but seems unlikely.. the qt5-based vogleditor64 binary runs fine here, though.

@deepfire
Copy link
Contributor Author

@ndowens, there's a build failure that ends with:

error: a ‘aarch64-linux’ is required to build ‘/nix/store/2ssy7xzn086xdbb5lpwhg611ksbmmmvr-options-db.xml.drv’, but I am a ‘x86_64-linux’

I'm not sure what to make of it..

@ndowens
Copy link
Contributor

ndowens commented Mar 19, 2017

Taking a look at it. Idk if I will be able to try and fix it tonight though

@deepfire
Copy link
Contributor Author

@ndowens, I have restricted platforms to intel linux -- let's see if this fixes it.

@ndowens
Copy link
Contributor

ndowens commented Mar 19, 2017

You are still using qt5 which fails

edit: might not have refreshed yet for me.
edit2: It wasn't refreshing for me when I made that comment; So I have pulled the copy and it is currently building; will update when I can, it is late here

description = "OpenGL capture / playback debugger.";
homepage = https://github.com/ValveSoftware/vogl;
license = licenses.bsd3;
maintainers = maintainers.deepfire;
Copy link
Member

@Mic92 Mic92 Mar 19, 2017

Choose a reason for hiding this comment

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

maintainers = [maintainers.deepfire];

@deepfire
Copy link
Contributor Author

@Mic92, fixed, thanks!

@deepfire
Copy link
Contributor Author

deepfire commented Mar 19, 2017

@ndowens, how does the qt5base problem manifest itself? Better yet -- what is the issue #? : -)

@deepfire
Copy link
Contributor Author

The qt version issue was resolved - the following seems to be odd:

builder for ‘/nix/store/4hz579lfl90ja8kyq2nvbp2rahvcx68f-nixpkgs-tarball-17.09pre1234.abcdef.drv’ failed with exit code 137

error: build of ‘/nix/store/4hz579lfl90ja8kyq2nvbp2rahvcx68f-nixpkgs-tarball-17.09pre1234.abcdef.drv’ failed

The command "./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable" exited with 100.

@deepfire
Copy link
Contributor Author

@ndowens, I have fixed the issue -- thanks to ttuegel, who helped me realise that the underlying version of qt5 has changed under the feet -- which explained why it built for me on the older version of nixpkgs.

@deepfire deepfire force-pushed the vogl branch 2 times, most recently from b5b0b9f to 2b60c03 Compare March 22, 2017 08:14
@deepfire
Copy link
Contributor Author

The issue we're hitting is #24200

@Mic92
Copy link
Member

Mic92 commented Mar 23, 2017

looks fine to except that one shared object is located in bin:

$ find /nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/nix-support
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/nix-support/propagated-native-build-inputs
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/bin
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/bin/voglgen64
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/bin/vogltest64
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/bin/libvogltrace64.so # <- that guy looks suspicious
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/bin/voglbench64
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/bin/vogleditor64
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/bin/vogl64
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/bin/ktxtool64
/nix/store/cjb971c4k5jkzrcrav59z9grljlvgdln-vogl-2016-05-13/bin/glxspheres64

@deepfire
Copy link
Contributor Author

@Mic92, that is by design -- the program assumes this location and breaks when it is located elsewhere.

@deepfire
Copy link
Contributor Author

Squashed, as per @ndowens suggestion.

@deepfire
Copy link
Contributor Author

@Mic92, @ndowens deferred the judgement on this PR to you.

@deepfire
Copy link
Contributor Author

deepfire commented Mar 26, 2017

Alright, now it works on SteamOS as well!

The only quirk is the requirement to tick the Use vogl tool checkbox during trace capture.

, freeglut, mesa, mesa_glu
}:
let
ver = "2016-05-13";
Copy link
Member

Choose a reason for hiding this comment

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

why not call this version right away?

@deepfire
Copy link
Contributor Author

@FRidh, done!

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

Successfully merging this pull request may close these issues.

None yet

4 participants