From 9744abab00769098b7d159a6426647ed78eb6494 Mon Sep 17 00:00:00 2001
From: Damien Diederen
Date: Thu, 4 Feb 2021 18:24:09 +0100
Subject: [PATCH 1/2] debBuild: Fix "duplicate formal function argument 'lib'"
As discussed here:
https://github.com/NixOS/nixpkgs/pull/111672#issuecomment-773484089
---
pkgs/build-support/release/debian-build.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 2544d5c740c..9ac335d288a 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -4,7 +4,7 @@
{ name ? "debian-build"
, lib
, diskImage
-, src, lib, stdenv, vmTools, checkinstall
+, src, stdenv, vmTools, checkinstall
, fsTranslation ? false
, # Features provided by this package.
debProvides ? []
From 56124f3e66ea302818e979e5f86f1464f6340270 Mon Sep 17 00:00:00 2001
From: Damien Diederen
Date: Thu, 4 Feb 2021 18:24:18 +0100
Subject: [PATCH 2/2] debBuild: Fix for "cannot coerce a set to a string"
Nix won't let us turn `lib` into an environment variable.
As discussed here:
https://github.com/NixOS/nixpkgs/pull/111672#issuecomment-773484089
---
pkgs/build-support/release/debian-build.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 9ac335d288a..2ab9ebb85f8 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -22,7 +22,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
prePhases = "installExtraDebsPhase sysInfoPhase";
}
- // removeAttrs args ["vmTools"] //
+ // removeAttrs args ["vmTools" "lib"] //
{
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");