summary refs log tree commit diff
diff options
context:
space:
mode:
authorRick van Schijndel <Mindavi@users.noreply.github.com>2022-06-23 22:12:29 +0200
committerGitHub <noreply@github.com>2022-06-23 22:12:29 +0200
commit40fc5e0737b245851b4750dd3b2f130b758bed6f (patch)
treeacf04d3872899db4386f40951632554c3e31c914
parentf25b909c6c478b813e577355bb2e328db80461ef (diff)
parent1ea0b578d0b78fbb375766186f2df6712255c9fd (diff)
downloadnixpkgs-40fc5e0737b245851b4750dd3b2f130b758bed6f.tar
nixpkgs-40fc5e0737b245851b4750dd3b2f130b758bed6f.tar.gz
nixpkgs-40fc5e0737b245851b4750dd3b2f130b758bed6f.tar.bz2
nixpkgs-40fc5e0737b245851b4750dd3b2f130b758bed6f.tar.lz
nixpkgs-40fc5e0737b245851b4750dd3b2f130b758bed6f.tar.xz
nixpkgs-40fc5e0737b245851b4750dd3b2f130b758bed6f.tar.zst
nixpkgs-40fc5e0737b245851b4750dd3b2f130b758bed6f.zip
Merge pull request #178616 from SuperSandro2000/gitea-
gitea: remove with lib over entire file, remove unused patchShebangs
-rw-r--r--pkgs/applications/version-management/gitea/default.nix15
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index fbf0138ce5a..2cddeea8162 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -12,8 +12,6 @@
 , nixosTests
 }:
 
-with lib;
-
 buildGoPackage rec {
   pname = "gitea";
   version = "1.16.8";
@@ -36,19 +34,18 @@ buildGoPackage rec {
   ];
 
   postPatch = ''
-    patchShebangs .
     substituteInPlace modules/setting/setting.go --subst-var data
   '';
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = optional pamSupport pam;
+  buildInputs = lib.optional pamSupport pam;
 
   preBuild =
     let
-      tags = optional pamSupport "pam"
-        ++ optional sqliteSupport "sqlite sqlite_unlock_notify";
-      tagsString = concatStringsSep " " tags;
+      tags = lib.optional pamSupport "pam"
+        ++ lib.optional sqliteSupport "sqlite sqlite_unlock_notify";
+      tagsString = lib.concatStringsSep " " tags;
     in
     ''
       export buildFlagsArray=(
@@ -66,14 +63,14 @@ buildGoPackage rec {
     cp -R ./go/src/${goPackagePath}/options/locale $out/locale
 
     wrapProgram $out/bin/gitea \
-      --prefix PATH : ${makeBinPath [ bash git gzip openssh ]}
+      --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
   '';
 
   goPackagePath = "code.gitea.io/gitea";
 
   passthru.tests.gitea = nixosTests.gitea;
 
-  meta = {
+  meta = with lib; {
     description = "Git with a cup of tea";
     homepage = "https://gitea.io";
     license = licenses.mit;