diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-09-25 11:30:31 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-09-28 10:43:46 +0100 |
| commit | 539e66c4291604806aca382201647bcf77d3cf73 (patch) | |
| tree | 400a688732b308272aacc88c23c9bb7ceac08471 /pkgs/os-specific/linux/zfs | |
| parent | 96466a57a98cc54689bfe4f420f9ff25610ee67b (diff) | |
| download | nixpkgs-539e66c4291604806aca382201647bcf77d3cf73.tar nixpkgs-539e66c4291604806aca382201647bcf77d3cf73.tar.gz nixpkgs-539e66c4291604806aca382201647bcf77d3cf73.tar.bz2 nixpkgs-539e66c4291604806aca382201647bcf77d3cf73.tar.lz nixpkgs-539e66c4291604806aca382201647bcf77d3cf73.tar.xz nixpkgs-539e66c4291604806aca382201647bcf77d3cf73.tar.zst nixpkgs-539e66c4291604806aca382201647bcf77d3cf73.zip | |
zfsUnstable: drop build patches
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/build-fixes-0.8.patch | 36 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 11 |
2 files changed, 2 insertions, 45 deletions
diff --git a/pkgs/os-specific/linux/zfs/build-fixes-0.8.patch b/pkgs/os-specific/linux/zfs/build-fixes-0.8.patch deleted file mode 100644 index ff2c6e2e150..00000000000 --- a/pkgs/os-specific/linux/zfs/build-fixes-0.8.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b323e7a7ebb2327943851fa3fd139399eb24d3dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Mon, 13 Aug 2018 22:58:21 +0200 -Subject: [PATCH] build fixes needed for nixos - ---- - module/Makefile.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/module/Makefile.in b/module/Makefile.in -index 935bd2663..afb08df81 100644 ---- a/module/Makefile.in -+++ b/module/Makefile.in -@@ -44,15 +44,15 @@ clean: - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \ -- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ -+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ - KERNELRELEASE=@LINUX_VERSION@ - @# Remove extraneous build products when packaging -- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -- if [ -n "$(DESTDIR)" ]; then \ -+ kmoddir=@prefix@$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -+ if [ -n "@prefix@" ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ -+ sysmap=@prefix@$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi --- -2.19.2 - diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index f704a8a2a6c..899e5f05509 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -19,7 +19,7 @@ let common = { version , sha256 - , extraPatches + , extraPatches ? [] , rev ? "zfs-${version}" , isUnstable ? false , incompatibleKernelVersion ? null }: @@ -103,6 +103,7 @@ let installFlags = [ "sysconfdir=\${out}/etc" "DEFAULT_INITCONF_DIR=\${out}/default" + "INSTALL_MOD_PATH=\${out}" ]; postInstall = optionalString buildKernel '' @@ -157,10 +158,6 @@ in { version = "0.8.2"; sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni"; - - extraPatches = [ - ./build-fixes-0.8.patch - ]; }; zfsUnstable = common { @@ -172,9 +169,5 @@ in { sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni"; isUnstable = true; - - extraPatches = [ - ./build-fixes-0.8.patch - ]; }; } |