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

misc pkgs: Fewer cross attrs #40291

Merged
merged 5 commits into from May 10, 2018
Merged

misc pkgs: Fewer cross attrs #40291

merged 5 commits into from May 10, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Progress towards #33302

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.

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: SDL, SDL2, freetype

The following builds were skipped because they don't evaluate on x86_64-darwin: libdrm

Partial log (click to expand)

/nix/store/4v2y8wgf6dhdwbi9p6kjnipxkbjbj4cm-SDL2-2.0.8/lib/libSDL2-2.0.0.dylib: fixing dylib
/nix/store/4v2y8wgf6dhdwbi9p6kjnipxkbjbj4cm-SDL2-2.0.8/lib/libSDL2-2.0.0.dylib: fixing dylib
/nix/store/4v2y8wgf6dhdwbi9p6kjnipxkbjbj4cm-SDL2-2.0.8/lib/libSDL2-2.0.0.dylib: fixing dylib
strip is /nix/store/kdff2gim6417493yha769kh00n63lnrw-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/864wsjyy02wy04pzi86qjmm5ngac9v6g-SDL2-2.0.8-dev/lib  /nix/store/864wsjyy02wy04pzi86qjmm5ngac9v6g-SDL2-2.0.8-dev/bin
patching script interpreter paths in /nix/store/864wsjyy02wy04pzi86qjmm5ngac9v6g-SDL2-2.0.8-dev
/nix/store/864wsjyy02wy04pzi86qjmm5ngac9v6g-SDL2-2.0.8-dev/bin/sdl2-config: interpreter directive changed from "/bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/8r9y5p25gvr0hpplf1ql8ckmb9zdxij5-SDL-1.2.15
/nix/store/4v2y8wgf6dhdwbi9p6kjnipxkbjbj4cm-SDL2-2.0.8
/nix/store/7xzr0r22z42c931ax7nqg2vvmclyl6ji-freetype-2.9

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: SDL, SDL2, freetype, libdrm

Partial log (click to expand)


Alternatively, you may set the environment variables I915_CFLAGS
and I915_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
builder for '/nix/store/r6wgs59f06a6imh60fgwiafyqch8p3hz-mesa-noglu-17.3.8.drv' failed with exit code 1
cannot build derivation '/nix/store/wy1hg60im38zxgrq14grvq48c7kb229q-libGL-1.0.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/7dl0lw9a2gkblcfvx5rqyvybwcjib16c-SDL2-2.0.8.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/cfaw35pm71hx63xx4i6g17w5rxzsx9sf-glu-9.0.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/bl7b8nys6bvmgm1rg5ihcl8ggayzgzp2-SDL-1.2.15.drv': 2 dependencies couldn't be built
error: build of '/nix/store/7dl0lw9a2gkblcfvx5rqyvybwcjib16c-SDL2-2.0.8.drv', '/nix/store/bl7b8nys6bvmgm1rg5ihcl8ggayzgzp2-SDL-1.2.15.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: SDL, SDL2, freetype

The following builds were skipped because they don't evaluate on x86_64-darwin: libdrm

Partial log (click to expand)

in configuration.nix to override this.

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


/nix/store/8r9y5p25gvr0hpplf1ql8ckmb9zdxij5-SDL-1.2.15
/nix/store/4v2y8wgf6dhdwbi9p6kjnipxkbjbj4cm-SDL2-2.0.8
/nix/store/7xzr0r22z42c931ax7nqg2vvmclyl6ji-freetype-2.9

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: SDL, SDL2, freetype, libdrm

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/mcyyvjj9zjaf7r55g5xs39q41sdhzf17-SDL2-2.0.8-dev
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/mcyyvjj9zjaf7r55g5xs39q41sdhzf17-SDL2-2.0.8-dev/lib  /nix/store/mcyyvjj9zjaf7r55g5xs39q41sdhzf17-SDL2-2.0.8-dev/bin
patching script interpreter paths in /nix/store/mcyyvjj9zjaf7r55g5xs39q41sdhzf17-SDL2-2.0.8-dev
/nix/store/mcyyvjj9zjaf7r55g5xs39q41sdhzf17-SDL2-2.0.8-dev/bin/sdl2-config: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/mcyyvjj9zjaf7r55g5xs39q41sdhzf17-SDL2-2.0.8-dev...
/nix/store/8hr6xww9cjrc7lm0k4x0cl44x6qzvvcn-SDL-1.2.15
/nix/store/25crnb1gvf03sf40c51hd83ssiv1aa11-SDL2-2.0.8
/nix/store/3192bm9pzlzj1f4nqf16zvaqr73k2fhc-freetype-2.9
/nix/store/y7xyva8ra4r1frpkz42i7xxacnicyxc8-libdrm-2.4.91

@Ericson2314
SDL, SDL2: Remove crossAttrs
219b74d 
Cross drvs are now the default for precisely this reason.
@Ericson2314
freetype: Remove crossAttrs
88ff3c0 
These sorts of C compiler confusions aren't really a problem anymore.
Everything is on the path with the right environment variables.
@Ericson2314
libdrm: Remove crossAttrs
e84b940 
No hashes should be changed.
@Ericson2314
libpng: Remove stale crossAttrs
7afe4f1 
Random ancient stuff for Darwin cross that seems not worth it.
@Ericson2314
libssh2: Remove crossAttrs
2b28312 
 - --with-<lib> stuff isn't needed with new default

 - `mingw_w64` probably also isn't needed, but kept with better code
   just in case.
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: SDL, SDL2, freetype, libdrm

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/296v36xf4hvq9ffnalwljw7ya23m8zhp-SDL2-2.0.8-dev
strip is /nix/store/gp7fylxwn18b7pl2c18ks89hsiaxyfvf-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/296v36xf4hvq9ffnalwljw7ya23m8zhp-SDL2-2.0.8-dev/lib  /nix/store/296v36xf4hvq9ffnalwljw7ya23m8zhp-SDL2-2.0.8-dev/bin
patching script interpreter paths in /nix/store/296v36xf4hvq9ffnalwljw7ya23m8zhp-SDL2-2.0.8-dev
/nix/store/296v36xf4hvq9ffnalwljw7ya23m8zhp-SDL2-2.0.8-dev/bin/sdl2-config: interpreter directive changed from "/bin/sh" to "/nix/store/a4qslf0yfs44mhnbagarn232sjnckhy0-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/296v36xf4hvq9ffnalwljw7ya23m8zhp-SDL2-2.0.8-dev...
/nix/store/g9f18skhgv6gw2nfx811wlr5smyv3rs0-SDL-1.2.15
/nix/store/4qhsr779zzvrq28wv150sxj2slxwdg99-SDL2-2.0.8
/nix/store/ia9b9879xmipfb4xssi8r75ssdwyf2a3-freetype-2.9
/nix/store/2jj6pirxhm1f2f66712zdm42lj9ciwam-libdrm-2.4.91

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: SDL, SDL2, freetype, libdrm

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/ilbm5ski1hm78j2ln3mqq17wj0ma0vrd-SDL2-2.0.8-dev
strip is /nix/store/gp7fylxwn18b7pl2c18ks89hsiaxyfvf-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ilbm5ski1hm78j2ln3mqq17wj0ma0vrd-SDL2-2.0.8-dev/lib  /nix/store/ilbm5ski1hm78j2ln3mqq17wj0ma0vrd-SDL2-2.0.8-dev/bin
patching script interpreter paths in /nix/store/ilbm5ski1hm78j2ln3mqq17wj0ma0vrd-SDL2-2.0.8-dev
/nix/store/ilbm5ski1hm78j2ln3mqq17wj0ma0vrd-SDL2-2.0.8-dev/bin/sdl2-config: interpreter directive changed from "/bin/sh" to "/nix/store/a4qslf0yfs44mhnbagarn232sjnckhy0-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/ilbm5ski1hm78j2ln3mqq17wj0ma0vrd-SDL2-2.0.8-dev...
/nix/store/draxv9k1jpnbd19lxbmk0nyikkzgls8i-SDL-1.2.15
/nix/store/l42z4wqf8vgyqijyl4ypiy4yb3mplp7q-SDL2-2.0.8
/nix/store/ia9b9879xmipfb4xssi8r75ssdwyf2a3-freetype-2.9
/nix/store/v9rlg5m5x5fncwpq4bh676arqdws697c-libdrm-2.4.91

@Ericson2314 Ericson2314 merged commit 4ae207a into NixOS:master May 10, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: SDL, SDL2, freetype, libdrm, libpng, libssh2

Partial log (click to expand)

/nix/store/8hr6xww9cjrc7lm0k4x0cl44x6qzvvcn-SDL-1.2.15
/nix/store/580y11zq14xag6ybrvzcbr7k93naman4-SDL2-2.0.8
/nix/store/3192bm9pzlzj1f4nqf16zvaqr73k2fhc-freetype-2.9
/nix/store/y7xyva8ra4r1frpkz42i7xxacnicyxc8-libdrm-2.4.91
/nix/store/1n47iy8z04x07ahq8phzdp1bvmqwfmmc-libpng-apng-1.6.34
/nix/store/8kanfjdi2yh998xbinc1m8ywysnf41k6-libssh2-1.8.0

@Ericson2314 Ericson2314 deleted the fewer-crossAttrs branch May 10, 2018 17:28
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: SDL, SDL2, freetype, libdrm, libpng, libssh2

Partial log (click to expand)

/nix/store/g9f18skhgv6gw2nfx811wlr5smyv3rs0-SDL-1.2.15
/nix/store/57xsz4ddqhcs5hcq084p68cjd19mabkz-SDL2-2.0.8
/nix/store/ia9b9879xmipfb4xssi8r75ssdwyf2a3-freetype-2.9
/nix/store/2jj6pirxhm1f2f66712zdm42lj9ciwam-libdrm-2.4.91
/nix/store/87s3ak35aq4svj4165lpq2qi5gzs2snm-libpng-apng-1.6.34
/nix/store/7f538fs1b88fssc7qmq8hkc7pbc5cbps-libssh2-1.8.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: SDL, SDL2, freetype, libpng, libssh2

The following builds were skipped because they don't evaluate on x86_64-darwin: libdrm

Partial log (click to expand)

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


/nix/store/8r9y5p25gvr0hpplf1ql8ckmb9zdxij5-SDL-1.2.15
/nix/store/3f9qv287i405js11zgbdwgcy3c5a8mrd-SDL2-2.0.8
/nix/store/7xzr0r22z42c931ax7nqg2vvmclyl6ji-freetype-2.9
/nix/store/s7ra5sq6na42fj93xw2bay80dhpf68dk-libpng-apng-1.6.34
/nix/store/mwdkj4cakd5dg62ai11g4dfgswk6q0xx-libssh2-1.8.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ericson2314 @GrahamcOfBorg