From d6823f421160e480c53919ab88cc74d481274694 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 25 May 2024 01:00:03 +0200 Subject: [PATCH 1/2] nixpkgs-lint: patch shebang --- maintainers/scripts/nixpkgs-lint.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index b400ce034b3e..037b79be8b3c 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation { '' mkdir -p $out/bin cp ${./nixpkgs-lint.pl} $out/bin/nixpkgs-lint + # make the built version hermetic + substituteInPlace $out/bin/nixpkgs-lint \ + --replace-fail "#! /usr/bin/env nix-shell" "#! ${lib.getExe perl}" wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB ''; From e9e8f72b3f8c97eca5a23472bd0ad475a2798bff Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 25 May 2024 01:03:30 +0200 Subject: [PATCH 2/2] nixpkgs-lint: refactor to pname+version and dontBuild --- maintainers/scripts/nixpkgs-lint.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index 037b79be8b3c..979ec286d809 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -1,13 +1,14 @@ { stdenv, lib, makeWrapper, perl, perlPackages }: stdenv.mkDerivation { - name = "nixpkgs-lint-1"; + pname = "nixpkgs-lint"; + version = "1"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl perlPackages.XMLSimple ]; dontUnpack = true; - buildPhase = "true"; + dontBuild = true; installPhase = ''