diff options
| author | Ruud van Asseldonk <dev@veniogames.com> | 2019-09-07 18:58:31 +0200 |
|---|---|---|
| committer | Ruud van Asseldonk <dev@veniogames.com> | 2019-09-07 18:58:31 +0200 |
| commit | a60ee9a74c8f9305469e2b8962aef05f33f64afc (patch) | |
| tree | 7bb1827672513489cc876ea61b3f68cd5dc48871 /pkgs/tools/filesystems/squashfs/default.nix | |
| parent | 442cf4f7834077c38320fa7c8aee6ff6d576bfde (diff) | |
| download | nixpkgs-a60ee9a74c8f9305469e2b8962aef05f33f64afc.tar nixpkgs-a60ee9a74c8f9305469e2b8962aef05f33f64afc.tar.gz nixpkgs-a60ee9a74c8f9305469e2b8962aef05f33f64afc.tar.bz2 nixpkgs-a60ee9a74c8f9305469e2b8962aef05f33f64afc.tar.lz nixpkgs-a60ee9a74c8f9305469e2b8962aef05f33f64afc.tar.xz nixpkgs-a60ee9a74c8f9305469e2b8962aef05f33f64afc.tar.zst nixpkgs-a60ee9a74c8f9305469e2b8962aef05f33f64afc.zip | |
squashfsTools: make alignment patch apply to 4.4
I took the patch, and applied it on top of the previous squashfs-tools commit that we packaged (which required editing one line in the patch, as it assumed to be applied on top of the reproducibility patches). Then I rebased that on top of master, resolved one conflict, and I formatted a new patch for this.
Diffstat (limited to 'pkgs/tools/filesystems/squashfs/default.nix')
| -rw-r--r-- | pkgs/tools/filesystems/squashfs/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 19a56a9466f..15a535eed3b 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -21,8 +21,7 @@ stdenv.mkDerivation { patches = [ # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. - # TODO(ruuda): make this patch apply to the proper 4.4 release. - # ./squashfs-tools-4.4-4k-align.patch + ./4k-align.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ zlib xz zstd ] |