diff options
author | Karel Kočí <cynerd@email.cz> | 2022-08-08 08:27:06 +0200 |
---|---|---|
committer | Karel Kočí <cynerd@email.cz> | 2022-08-08 08:27:06 +0200 |
commit | 07896ee61dba47bc57c4c3b3b819033dc0324a1b (patch) | |
tree | 42ee9d052e6738e7b5dac4a1842f20f72bf4ed96 /pkgs/default.nix | |
parent | defa8544d9437116a652827db62cbbf1f8933d5e (diff) | |
download | nixturris-07896ee61dba47bc57c4c3b3b819033dc0324a1b.tar.gz nixturris-07896ee61dba47bc57c4c3b3b819033dc0324a1b.tar.bz2 nixturris-07896ee61dba47bc57c4c3b3b819033dc0324a1b.zip |
Turris Omnia cross build now should work
Diffstat (limited to 'pkgs/default.nix')
-rw-r--r-- | pkgs/default.nix | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index 929d030..a64757f 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -19,37 +19,6 @@ let #crypto-wrapper = callPackage ./crypto-wrapper { }; #certgen = python3Packages.callPackage ./certgen { }; - # Overrides to get build to work - patchelf = armv7lDisableCheck nixpkgs.patchelf; - bison = armv7lDisableCheck nixpkgs.bison; - findutils = armv7lDisableCheck nixpkgs.findutils; - libuv = armv7lDisableCheck nixpkgs.libuv; - p11-kit = armv7lDisableCheck nixpkgs.p11-kit; - elfutils = armv7lDisableCheck nixpkgs.elfutils; - glib = armv7lDisableCheck nixpkgs.glib; - rustc = armv7lDisableCheck nixpkgs.rustc; - mdbook = armv7lDisableCheck nixpkgs.mdbook; - ell = armv7lDisableCheck nixpkgs.ell; - polkit = armv7lDisableCheck nixpkgs.polkit; - udisks2 = disableCheck nixpkgs.udisks2; - udisks = udisks2; - llvm = armv7lDisableCheck nixpkgs.llvm; - llvm_14 = armv7lDisableCheck nixpkgs.llvm_14; - jemalloc = armv7lDisableCheck nixpkgs.jemalloc; - openssh = armv7lDisableCheck nixpkgs.openssh; - nlohmann_json = armv7lDisableCheck nixpkgs.nlohmann_json; - libseccomp = armv7lDisableCheck nixpkgs.libseccomp; - openldap = armv7lDisableCheck nixpkgs.openldap; - # Crosscompilation worarounds - btrfs-progs = nixpkgs.btrfs-progs.overrideAttrs (oldAttrs: { - configureFlags = ["--disable-python"]; - installFlags = []; - }); - pixz = nixpkgs.pixz.overrideAttrs (oldAttrs: { - configureFlags = ["--without-manpage"]; - patches = [ ./0001-configure.ac-replace-AC_CHECK_FILE.patch ]; - }); - }; in turrispkgs |