Commit Graph
100 Commits
Author SHA1 Message Date
Matthew Bauer c6ff360cc4 python-dbusmock: avoid eval error when missing test output of bluez
This fixes an evaluation error that occurs when we don’t have
bluez.test. getOutput defaults to "out" in these cases.
2020-04-06 16:36:30 -04:00
Matthew Bauer 51ab062863 dvtm: add ncurses dev input to PATH
fixes cross compilation
2020-04-06 16:36:30 -04:00
Matthew Bauer dcb8c6fa8b kodi: fix cross compilation
- provide native binaries
- set cpu / os / etc. flags
- fix wayland compilation
2020-04-06 16:36:30 -04:00
Matthew Bauer 97309f7fa2 fstrcmp: patch for cross
Patches fstrcmp to cross-compile
2020-04-06 16:36:30 -04:00
Matthew Bauer 89dac3c856 flatbuffers: don’t build tests when cross compiling 2020-04-06 16:36:30 -04:00
Matthew Bauer 7887d50ae4 ftgl: add --with-ft-prefix for finding freetype
freetype-config is not in PATH when cross-compiling. We need to
provide our own.
2020-04-06 16:36:29 -04:00
Matthew Bauer bedd47ed4b libcddb: force malloc and realloc
This needs to be set to avoid having undefined malloc symbol.
2020-04-06 16:36:29 -04:00
Matthew Bauer a1c6dea273 libcdio: get native help2man 2020-04-06 16:36:29 -04:00
Matthew Bauer 72363f71bf libcec: get native cmake for cross 2020-04-06 16:36:29 -04:00
Matthew Bauer 433d5178ca setup-hooks/auto-patchelf.sh: get prefixed readelf 2020-04-06 16:36:29 -04:00
Matthew Bauer 5256aa688f libcrossguid: get prefixed utility 2020-04-06 16:36:29 -04:00
Matthew Bauer 5c80a3585b tinyxml2: fix cross compilation
- use native unzip
- add target prefix to LD
2020-04-06 16:36:28 -04:00
Matthew Bauer 71a9eb80e7 waylandpp: fix cross compilation
- add libffi dependency
- provide wayland-scanner++ when cross compiling
2020-04-06 16:36:28 -04:00
Matthew Bauer 99355cc2e4 libasyncns: override malloc null check in cross
This is needed to build and avoid malloc error.
2020-04-06 16:36:28 -04:00
Matthew Bauer a656aeb7f1 libvisual: fix null malloc check on cross
this is needed to build
2020-04-06 16:36:28 -04:00
Matthew Bauer 024877e7b2 alsa-plugins: move pkgconfig to native 2020-04-06 16:36:28 -04:00
Matthew Bauer 0bbdba2d11 bluez: don’t build python packages when tests are disabled
Can’t run these on cross anyway
2020-04-06 16:36:28 -04:00
Matthew Bauer e446334824 libvpx: set proper target name
- Needs to be like <cpu>-<os>-gcc.
- Remove unneeded --enable-external-build flag
    This confuses the feature detection and is not needed for cross
    compilation anymore.
2020-04-06 16:36:28 -04:00
Matthew Bauer 24f8bad37c libXres: enable cross-compilation
- adds utilmacros
- set null malloc flag
2020-04-06 16:36:27 -04:00
Matthew Bauer 7cc40e15e4 treewide/nixos: use stdenv.cc.libc instead of glibc when available
This prevents duplication in cross-compiled nixos machines. The
bootstrapped glibc differs from the natively compiled one, so we get
two glibc’s in the closure. To reduce closure size, just use
stdenv.cc.libc where available.
2020-04-06 16:36:27 -04:00
Matthew Bauer 8a5059e1cc fontconfig: only generate cache on native compilation
We can’t cross-compile the cache, so just skip it for now.
2020-04-06 16:36:22 -04:00
Matthew Bauer 6c5983a291 gdk-pixbuf: make target env hook
Unfortunately, we need to emulate the system to get a real cache.
Native version doesn’t know the right paths.
2020-04-06 16:36:22 -04:00
Matthew Bauer 93a8887531 hicolor-icon-theme: only add target icons to deps 2020-04-06 16:36:22 -04:00
Matthew Bauer 36109cda6e glib: put gsettings directory in target
These should be runtime, not build time deps
2020-04-06 16:36:22 -04:00
Matthew Bauer 80be56bd6a epiphany: include gtk3 build dependency 2020-04-06 16:36:21 -04:00
Matthew Bauer 777a2b4c56 xorg.libXScrnSaver: add utilmacros and malloc 0 2020-04-06 16:36:21 -04:00
Matthew Bauer 65b967fd38 libva: add wayland as native build input
Also set wayland-scanner to proper path
2020-04-06 16:36:21 -04:00
Matthew Bauer 3a71e62c56 plymouth: set systemd-tty-ask-password-agent path
This is needed in cross where systemd is not in path.
2020-04-06 16:36:21 -04:00
Matthew Bauer 139fd8b397 gdk-pixbuf: support cross compilation
- add glib to nativeBuildInputs
- only update loaders cache on native builds
2020-04-06 16:36:21 -04:00
Matthew Bauer f8347478a8 vulkan-loader: make cmake a native build input 2020-04-06 16:36:21 -04:00
Matthew Bauer 0f41c1582f cracklib: only use local binaries on native build 2020-04-06 16:36:21 -04:00
Matthew Bauer d0dbdfea4f git: fix cross compilation 2020-04-06 16:36:14 -04:00
Matthew Bauer 7d278d7e33 retroarch: add wayland dependency and fix cross
- Need custom pkg-config setting
- add wayland & libxkbcommon
2020-04-05 21:37:45 -04:00
Matthew Bauer eab992b4ac Merge pull request #83112 from bhipple/dev/reltools-cleanup
releaseTools: no-op expression cleanup
2020-04-04 17:18:28 -05:00
Matthew Bauer efae68aa49 Merge pull request #83906 from nh2/krb5-1.18-fix-musl-build
krb5: Add patches to fix build with musl on 1.18
2020-04-01 15:08:08 -05:00
Matthew Bauer fd6278500b Merge pull request #83889 from matthewbauer/andyetitmoves-make-unconditional
andyetitmoves: make unconditional
2020-03-31 22:06:45 -05:00
Matthew Bauer 6852f3c988 Merge pull request #83890 from matthewbauer/remove-ppc-bootstrap-tools
stdenv/linux: remove powerpc64le bootstrap tools
2020-03-31 22:05:50 -05:00
Matthew Bauer 8e3c712e24 Merge pull request #83891 from matthewbauer/retroarch-fix-macos
retroarch/cores.nix: use correct platform for darwin
2020-03-31 22:05:36 -05:00
Matthew Bauer eb84499355 retroarch/cores.nix: use correct platform for darwin
This should fix the regression found in
https://hydra.nixos.org/eval/1577308#tabs-now-fail. The libretro
scripts use “osx” as the identifier for macOS, and “unix” seems to
mean linux.

If anyone could help out by confirming this works. I don’t currently
have access to a macOS machine.
2020-03-31 15:07:57 -04:00
Matthew Bauer e45f16b9f5 stdenv/linux: remove powerpc64le bootstrap tools
These files never existed, so best to not leave the reference. If
someone want to step up to maintain this, that would be fine. I don’t
have the hardware to test these out. In addition, someone tried to use
the bootstrap-tools currently built by Hydra and found that they were
broken in some unclear way.
2020-03-31 15:03:26 -04:00
Matthew Bauer cc7fec170b andyetitmoves: make unconditional
This should never be null - the meta.platforms gives us an assertion.
2020-03-26 17:32:25 -04:00
Matthew Bauer e003ae1874 Merge pull request #83159 from khumba/pydf
pydf: install man page and default config file
2020-03-26 11:00:40 -05:00
Matthew Bauer 1efa4c4f39 Merge pull request #83246 from r-ryantm/auto-update/rgbds
rgbds: 0.3.9 -> 0.3.10
2020-03-23 19:12:58 -04:00
Matthew Bauer 11f8bb71f8 Merge pull request #83240 from kolbycrouch/picodrive-fix
retroarch: fix picodrive on aarch64
2020-03-23 17:03:34 -04:00
Matthew Bauer e7dc153109 Merge pull request #83117 from Ninlives/netease-music-fix
netease-cloud-music: do not set QT_AUTO_SCREEN_SCALE_FACTOR
2020-03-22 14:47:12 -04:00
Matthew Bauer 082afb21f2 Merge pull request #79704 from rnhmjoj/powerline-fonts
powerline-fonts: install psf to share/consolefonts
2020-03-22 14:45:47 -04:00
Matthew Bauer bacccb7823 Merge pull request #80784 from enolan/fix-eatmydata
libeatmydata: fix launcher script - find shell library properly
2020-03-22 14:42:52 -04:00
Matthew Bauer b94300945a Merge pull request #75940 from davidtwco/wooting-init
wooting: init wootility, wooting-udev-rules and module
2020-03-22 02:03:52 -04:00
Matthew Bauer c08d6d55dc Merge pull request #82781 from DieGoldeneEnte/llvm10-rc4
llvmPackages_10: rc3 -> rc4 -> rc5, polly enabled by default
2020-03-22 02:00:41 -04:00
Matthew Bauer 46f8756aee Merge pull request #79593 from thefloweringash/wafhook-phases
wafHook: allow overriding phases and disabling of cross flags
2020-03-22 01:59:41 -04:00
Matthew Bauer 81d84153c7 Merge pull request #82633 from kolbycrouch/master
retroarch: 1.8.1 -> 1.8.5
2020-03-21 23:49:01 -04:00
Matthew Bauer ed46adb48b retroarch/cores.nix: use correct license for gw
This should be zlib the license, not zlib the package.
2020-03-21 23:38:58 -04:00
Matthew Bauer a8a0cb147f retroarch: remove macOS app support
This is badly out of date so requires extra work to get working.

Anyway, you can still use it without the menu, with no problem.
2020-03-21 23:36:54 -04:00
Matthew Bauer 9d8d66baf5 nixos/nixpkgs.nix: Allow just using config in system (#80818)
* nixos/nixpkgs.nix: Allow just using config in system

This assertion requires system to work properly. We might not have
this in cases where the user just sets config and wants Nixpkgs to
infer system from that. This adds a default for when this happens,
using doubleFromSystem.

* parens
2020-03-21 23:23:24 -04:00
Matthew Bauer 6b95893a6d Merge pull request #81042 from KoviRobi/zhf-20.03-fix-noweb
noweb: fix installation of manpages, use placeholders
2020-03-21 23:21:19 -04:00
Matthew Bauer 0127594a93 Merge pull request #80778 from expipiplus1/restic-cross
restic: fix cross compilation
2020-03-21 23:18:51 -04:00
Matthew Bauer 4327049a1c Merge pull request #82708 from hamishmack/openssl-musl
openssl: Fix openssl build for x86_64-unknown-linux-musl
2020-03-21 23:10:53 -04:00
Matthew Bauer 293b16aae9 Merge remote-tracking branch 'origin/master' into retroarch-update 2020-03-21 23:01:45 -04:00
Matthew Bauer f094e132e2 retroarch/cores.nix: cleanup
- Avoid using overrides unless necessary
- Set platform and ARCH by default
- Don’t set dontConfigure unless absolutely necessary
- Use preBuild instead of overriding entire configurePhase
2020-03-21 23:01:01 -04:00
Matthew Bauer d513980ea6 retroarch: 1.8.4 -> 1.8.5 2020-03-21 22:59:18 -04:00
Matthew Bauer e1cab10dcd Revert " Fix init"
This reverts commit e68a4094d2.
2020-03-21 22:58:58 -04:00
Matthew Bauer bd0fef954a Merge pull request #83046 from khumba/patch-shebangs-error-message-fix
patch-shebangs.sh: fix error messages to go to stderr, not '0' file
2020-03-20 22:13:14 -04:00
Matthew Bauer 078b222dc6 Merge pull request #83010 from volth/patch-393
$toplevel/system: use kernel's architecture
2020-03-20 14:05:00 -04:00
Matthew Bauer bd15dfa21b Merge pull request #82853 from sepiabrown/patch-2
glib-networking for TLS/SSL network (https://) in xwidget
2020-03-18 13:48:35 -04:00
Matthew Bauer 655e29d049 Merge pull request #81858 from matthewbauer/mb-cross-fixes-march-2020
Cross compilation fixes (march 2020)
2020-03-16 18:51:51 -04:00
Matthew Bauer 67b0ddf3f3 Merge remote-tracking branch 'origin/staging' into mb-cross-fixes-march-2020 2020-03-16 14:34:03 -04:00
Matthew BauerandJan Tojnar e9c2957c14 treewide: add comments on where native inputs are needed
makes it more clear why this happens

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2020-03-16 14:27:23 -04:00
Matthew BauerandJan Tojnar c6b320a679 bubblewrap: put docbook_xsl, libxslt in nativeBuildInputs
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2020-03-16 14:24:09 -04:00
Matthew Bauer acb24b4cc4 lib/systems: Assume newlib when no kernel and no libc is provided
newlib is the default for most tools when no kernel is provided. Other
exist, but this seems like a safe default.

(cherry picked from commit 8009c20711)
2020-03-12 02:22:19 -04:00
Matthew Bauer 8d72e6bd5f util-linux: use $bin output for umount
This wasn’t updated when adding the bin output.
2020-03-06 07:14:20 +01:00
Matthew Bauer dfbe76a681 waf: move binary to $out/bin/
Originally this was just the executable, but this breaks nix-shell
usage. Instead, just do a normal directory.

Fixes #79909
2020-03-06 07:06:01 +01:00
Matthew Bauer 1265615594 gtk-icon-cache: get native gtk3 for icon cache 2020-03-06 00:45:48 -05:00
Matthew Bauer f8006597a8 breeze-plymouth: make some things native
some of these only need to be on the build machine.
2020-03-06 00:45:48 -05:00
Matthew Bauer 1bac797616 plymouth: update configure flags
- only set host when cross compiling
- use top-level configureFlags and installFlags instead of putting it
  in the pre configure.
2020-03-06 00:45:47 -05:00
Matthew Bauer d1e58be703 nixos-artwork: make imagemagick a native build input
This is only needed on the builder, no need to cross compile it.
2020-03-06 00:45:47 -05:00
Matthew Bauer 5ffd779348 pango: add glib to nativeBuildInputs
Needed for some build tool
2020-03-06 00:45:47 -05:00
Matthew Bauer 636a072df5 json-glib: add glib to nativeBuildInputs
Needed for some build tools in glib
2020-03-06 00:45:47 -05:00
Matthew Bauer 7996be73b5 gsettings-desktop-schemas: add glib to nativeBuildInputs 2020-03-06 00:45:46 -05:00
Matthew Bauer 7aed3f8877 dconf: needs glib in nativeBuildInputs 2020-03-06 00:45:46 -05:00
Matthew Bauer ebdd644836 atk: needs glib in nativeBuildInputs 2020-03-06 00:45:46 -05:00
Matthew Bauer 895ef23658 libsoup: needs glib in nativeBuildInputs 2020-03-06 00:45:46 -05:00
Matthew Bauer 439704b092 glade: add libxml2 to nativeBuildInputs
Some build tools are needed from here
2020-03-06 00:45:46 -05:00
Matthew Bauer 84b7c644ae gnome-desktop: needs glib in nativeBuildInputs 2020-03-06 00:45:45 -05:00
Matthew Bauer 66fcc60af8 epiphany: fix cross compilation 2020-03-06 00:45:45 -05:00
Matthew Bauer b5efbd50de libhandy: add libxml2 to nativeBuildInputs
Some build tools are needed for code gen.
2020-03-06 00:45:45 -05:00
Matthew Bauer 09c498fe66 libdazzle: add glib to nativeBuildInputs
This is needed for build tools.
2020-03-06 00:45:45 -05:00
Matthew Bauer d2775e4ce0 webkitgtk: ignore gettext when cross compiling
Unfortunately, CMake looks in CMAKE_PREFIX_PATH for binaries when
cross-compiling. This means that it will use gettext from
CMAKE_PREFIX_PATH even when we provide a gettext binary in PATH! This
is bad because the on in CMAKE_PREFIX_PATH is for the cross system,
not the native one. The only documented way I can find to change this
behavior is by manually setting the CMAKE_IGNORE_PATH variable.
2020-03-06 00:45:45 -05:00
Matthew Bauer f773ef51c5 gcr: specify libgrypt prefix
This is needed for cross because gcrypt-config is not available to
execute. It’s safe to do otherwise as well though.
2020-03-06 00:45:38 -05:00
Matthew Bauer f187d8c26f wlroots: add wayland as nativeBuildInputs
Needed on the build machine
2020-03-05 20:42:35 -05:00
Matthew Bauer 78f9cad387 cage: add wayland as nativeBuildInputs
Needed on the build machine
2020-03-05 20:42:09 -05:00
Matthew Bauer 8c3160b619 bubblewrap: use buildInputs instead of nativeBuildInputs
these are all libraries.
2020-03-05 20:41:46 -05:00
Matthew Bauer 5198179adc gstreamer: needs extra build inputs
Cross needs some extra native tools:

- glib
- wayland
- orc
- glib is needed in nativeBuildInputs

Also:

- bash-completion needs to be available for PKG_CONFIG_PATH
2020-03-05 20:41:06 -05:00
Matthew Bauer de14f0c6e1 libinput: move test dependencies to checkInputs
This avoids pulling them in when tests are disabled.
2020-03-05 20:40:45 -05:00
Matthew Bauer fdfde0324e libsecret: add glib as a native dependency
glib is both a native and target dependency. Some binary from glib is
used to generate files.
2020-03-05 20:40:28 -05:00
Matthew Bauer e0ac0546de libpsl: add libxslt as a native dependency
libxslt is actually both a target and native build input because some
libxslt binary is needed to generate files and the built binaries also
link against libxslt.
2020-03-05 20:39:34 -05:00
Matthew Bauer 42fe7c7d47 libevdev: python is a native input 2020-03-05 20:39:00 -05:00
Matthew Bauer d8b92121d4 aspell: perl is also a native build input
This is needed for some scripts needed at build time.
2020-03-05 20:38:43 -05:00
Matthew Bauer bad6770d27 elfutils: remove unneeded custom cross build/install phase
This is no longer needed. elfutils compiles out of the box!
2020-03-05 20:38:30 -05:00
Matthew Bauer b8102aa32e Merge pull request #81844 from lopsided98/gcc-separate-output-cross
gcc: place cross-compiled target libraries in lib output
2020-03-05 20:30:35 -05:00
Matthew BauerandFlorian Klink e0e4d591cc nixos/cage: init
Add a cage module to nixos. This can be used to make kiosk-style
systems that boot directly to a single application. The user (demo by
default) is automatically logged in by this service and the
program (xterm by default) is automatically started.

This is useful for some embedded, single-user systems where we want
automatic booting. To keep the system secure, the user should have
limited privileges.

Based on the service provided in the Cage wiki here:

https://github.com/Hjdskes/cage/wiki/Starting-Cage-on-boot-with-systemd

Co-Authored-By: Florian Klink <flokli@flokli.de>
2020-03-02 13:43:20 -08:00