Skip to content

Commit

Permalink
driversi686Linux: init
Browse files Browse the repository at this point in the history 
This is added so that Hydra would build several drivers-related packages for i686.

Closes #30455.
  • Loading branch information
@abbradar
abbradar committed Oct 19, 2017
1 parent 0bc4216 commit 1360c35
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Expand Up @@ -8029,6 +8029,18 @@ with pkgs;

dotconf = callPackage ../development/libraries/dotconf { };

# Multi-arch "drivers" which we want to build for i686.
driversi686Linux = recurseIntoAttrs {
inherit (pkgsi686Linux)
mesa_noglu
vaapiIntel
libvdpau-va-gl
vaapiVdpau
beignet
glxinfo
vdpauinfo;
};

dssi = callPackage ../development/libraries/dssi {};

dxflib = callPackage ../development/libraries/dxflib {};
Expand Down

6 comments on commit 1360c35

@vcunat
Copy link
Member

@vcunat vcunat commented on 1360c35 Nov 1, 2017

Choose a reason for hiding this comment

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

Eh, this is starting to get a little wild: https://hydra.nixos.org/job/nixpkgs/trunk/driversi686Linux.vaapiIntel.x86_64-darwin :-D

@vcunat
Copy link
Member

@vcunat vcunat commented on 1360c35 Nov 1, 2017 •
edited

Choose a reason for hiding this comment

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

Maybe something like if system != "x86_64-linux" then null else?

@abbradar
Copy link
Member Author

Choose a reason for hiding this comment

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

Eh, what happens here?

Job nixpkgs:trunk:driversi686Linux.vaapiIntel.x86_64-darwin
Latest builds, system: i686-linux

Workaround looks good, I just am very curious how...

@vcunat
Copy link
Member

@vcunat vcunat commented on 1360c35 Nov 4, 2017

Choose a reason for hiding this comment

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

pkgsi686Linux doesn't touch meta.platforms, so Hydra generates those attributes as usual. Maybe we should improve the implementation of pkgsi686Linux instead.

@abbradar
Copy link
Member Author

Choose a reason for hiding this comment

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

I'm thinking the same thing actually, came up with pkgsi686Linux = if system != "x86_64-linux" then pkgs else .... IIUC this would work.

@matthewbauer
Copy link
Member

Choose a reason for hiding this comment

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

This is pretty expensive to do especially on Aarch64:

https://hydra.nixos.org/build/74959948#tabs-buildsteps

Is it okay to make it conditional?

Please sign in to comment.