diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-04-26 13:54:42 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-05-01 16:41:18 +0200 |
| commit | c385cc1c05efd2d44a02fd729a6a0241adf9004c (patch) | |
| tree | 3bdf062805ad87c38e7ddca13e319b1be8324257 /pkgs | |
| parent | 22b1fcfeb53e0f712315c8008c8be9500832f6f7 (diff) | |
| download | nixturris-c385cc1c05efd2d44a02fd729a6a0241adf9004c.tar.gz nixturris-c385cc1c05efd2d44a02fd729a6a0241adf9004c.tar.bz2 nixturris-c385cc1c05efd2d44a02fd729a6a0241adf9004c.zip | |
Switch to unstable
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index 50d6f13..abbea4f 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,11 +4,12 @@ let pkgs = nixpkgs // turrispkgs; callPackage = nixlib.callPackageWith pkgs; - armv7lDisableCheck = pkg: if nixpkgs.system != "armv7l-linux" then pkg - else pkg.overrideAttrs (oldAttrs: { - doCheck = false; - doInstallCheck = false; - }); + disableCheck = pkg: pkg.overrideAttrs (oldAttrs: { + doCheck = false; + doInstallCheck = false; + }); + armv7lDisableCheck = pkg: if nixpkgs.system != "armv7l-linux" then pkg else disableCheck pkg; + aarch64DisableCheck = pkg: if nixpkgs.system != "aarch64-linux" then pkg else disableCheck pkg; turrispkgs = with pkgs; { @@ -16,7 +17,8 @@ let libatsha204 = callPackage ./libatsha204 { }; mox-otp = python3Packages.callPackage ./mox-otp { }; - # Overrides to get armv7 to work + # Overrides to get build to work + patchelf = armv7lDisableCheck nixpkgs.patchelf; bison = armv7lDisableCheck nixpkgs.bison; findutils = armv7lDisableCheck nixpkgs.findutils; libuv = armv7lDisableCheck nixpkgs.libuv; @@ -29,6 +31,9 @@ let polkit = armv7lDisableCheck nixpkgs.polkit; udisks2 = armv7lDisableCheck nixpkgs.udisks2; udisks = udisks2; + llvm = armv7lDisableCheck nixpkgs.llvm; + llvm_14 = armv7lDisableCheck nixpkgs.llvm_14; + jemalloc = armv7lDisableCheck nixpkgs.jemalloc; }; |