about summary refs log tree commit diff
path: root/nixpkgs/pkgs/servers/hydron
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-04-06 16:18:51 +0000
committerAlyssa Ross <hi@alyssa.is>2020-04-06 16:18:51 +0000
commit9afbeb71219925d54b72b0170b2e3be76bad1e28 (patch)
treed80c6bf0441de5412475859de320806b0e5a454c /nixpkgs/pkgs/servers/hydron
parent75eafe97f7df0d653bec67f3962214d7c357831f (diff)
parentae6bdcc53584aaf20211ce1814bea97ece08a248 (diff)
downloadnixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar
nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.gz
nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.bz2
nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.lz
nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.xz
nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.zst
nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.zip
Merge commit 'ae6bdcc53584aaf20211ce1814bea97ece08a248'
# Conflicts:
#	nixpkgs/pkgs/build-support/rust/default.nix
#	nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/servers/hydron')
-rw-r--r--nixpkgs/pkgs/servers/hydron/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/servers/hydron/default.nix b/nixpkgs/pkgs/servers/hydron/default.nix
index 6ac37a98deea..145d341bb516 100644
--- a/nixpkgs/pkgs/servers/hydron/default.nix
+++ b/nixpkgs/pkgs/servers/hydron/default.nix
@@ -15,8 +15,10 @@ buildGoPackage {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ffmpeg-full graphicsmagick quicktemplate go-bindata easyjson ];
+
+  nativeBuildInputs = [ pkgconfig go-bindata ];
+
+  buildInputs = [ ffmpeg-full graphicsmagick quicktemplate easyjson ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bakape/hydron";