diff options
| author | Taeer Bar-Yam <taeer@bar-yam.me> | 2022-02-16 16:58:20 -0500 |
|---|---|---|
| committer | Taeer Bar-Yam <taeer@bar-yam.me> | 2022-02-23 10:41:28 -0500 |
| commit | 00e74ad907f9e9c57be90bf3983d2f7ea7442b56 (patch) | |
| tree | 5fc4c951ce866d921bc44428ce58d9ceec91d045 /pkgs/applications/networking/misc | |
| parent | 4d38b6460f564bd69586fe5c1bdead99310f31cd (diff) | |
| download | nixpkgs-00e74ad907f9e9c57be90bf3983d2f7ea7442b56.tar nixpkgs-00e74ad907f9e9c57be90bf3983d2f7ea7442b56.tar.gz nixpkgs-00e74ad907f9e9c57be90bf3983d2f7ea7442b56.tar.bz2 nixpkgs-00e74ad907f9e9c57be90bf3983d2f7ea7442b56.tar.lz nixpkgs-00e74ad907f9e9c57be90bf3983d2f7ea7442b56.tar.xz nixpkgs-00e74ad907f9e9c57be90bf3983d2f7ea7442b56.tar.zst nixpkgs-00e74ad907f9e9c57be90bf3983d2f7ea7442b56.zip | |
minor changes
Diffstat (limited to 'pkgs/applications/networking/misc')
| -rw-r--r-- | pkgs/applications/networking/misc/zammad/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index 203ede07305..97e76095318 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -21,7 +21,7 @@ let pname = "zammad"; version = "5.0.2"; - sourceDir = applyPatches { + src = applyPatches { src = fetchFromGitHub (builtins.fromJSON (builtins.readFile ./source.json)); @@ -52,7 +52,7 @@ let # https://docs.zammad.org/en/latest/prerequisites/software.html#ruby-programming-language inherit ruby_2_7; - gemdir = sourceDir; + gemdir = src; gemset = ./gemset.nix; groups = [ "assets" @@ -86,19 +86,15 @@ let yarnEnv = yarn2nix-moretea.mkYarnPackage { pname = "${pname}-node-modules"; - inherit version; - src = sourceDir; + inherit version src; yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; - packageJSON = sourceDir + "/package.json"; + packageJSON = src + "/package.json"; }; in stdenv.mkDerivation { - name = "${pname}-${version}"; - inherit pname version; - - src = sourceDir; + inherit pname version src; buildInputs = [ rubyEnv @@ -138,6 +134,6 @@ stdenv.mkDerivation { homepage = "https://zammad.org"; license = licenses.agpl3Plus; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ n0emis ]; + maintainers = with maintainers; [ n0emis garbas taeer ]; }; } |