public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: generalise for both mysql & mariadb

Browse Source
This commit is contained in:
Robin Gloster
2017-12-29 02:18:35 +01:00
parent 6903ea6050
commit 572b2bda4e
13 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/snabb/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools }:
{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools }:
stdenv.mkDerivation rec {
name = "snabb-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
done
# We need a way to pass $PATH to the scripts
sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mariadb which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mysql.client which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
'';