From 8dbe89fbe00b6a6954d21ba1f1d66969e05515ea Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 20 May 2024 14:00:20 +0200 Subject: [PATCH] freebsd: fix eval with Nix < 2.6 --- pkgs/os-specific/bsd/freebsd/default.nix | 2 +- pkgs/os-specific/bsd/freebsd/package-set.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index c605d9f70937..e56c70c1d32d 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -52,7 +52,7 @@ let sourceData = versions.${self.branch} or (throw (badBranchError self.branch)); versionData = self.sourceData.version; buildFreebsd = otherSplices.selfBuildHost; - patchesRoot = ./patches/${self.versionData.revision}; + patchesRoot = ./patches + "/${self.versionData.revision}"; } // extraArgs ) self; diff --git a/pkgs/os-specific/bsd/freebsd/package-set.nix b/pkgs/os-specific/bsd/freebsd/package-set.nix index dfde4a0a31fa..4ff6cb210249 100644 --- a/pkgs/os-specific/bsd/freebsd/package-set.nix +++ b/pkgs/os-specific/bsd/freebsd/package-set.nix @@ -17,7 +17,7 @@ lib.packagesFromDirectoryRecursive { } // { inherit sourceData patchesRoot versionData; - patches = ./patches/${self.versionData.revision}; + patches = ./patches + "/${self.versionData.revision}"; # Keep the crawled portion of Nixpkgs finite. buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd;