diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:08:51 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:08:51 +0200 |
| commit | 8576d24b2ac27a216b6e32b167c258ae4f8bfe69 (patch) | |
| tree | 1681d9aeddb08a34c1e6fc49df025adc77d5fbf5 /pkgs/tools/filesystems | |
| parent | 5f47c36752c167131d8e77e59b9374d7e0da7353 (diff) | |
| parent | dc33419285c09720de70fe8edf5434736a2462b9 (diff) | |
| download | nixpkgs-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar nixpkgs-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar.gz nixpkgs-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar.bz2 nixpkgs-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar.lz nixpkgs-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar.xz nixpkgs-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar.zst nixpkgs-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/moosefs/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/netatalk/default.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index af09cafe1de..8ceb3d7c0aa 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -5,7 +5,7 @@ , fuse , pkgconfig , libpcap -, zlib +, zlib }: stdenv.mkDerivation rec { @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { [ fuse libpcap zlib ]; postInstall = '' + substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\"" wrapProgram $out/sbin/mfscgiserv \ --prefix PATH ":" "${python}/bin" ''; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index faa0a1ebfe8..f7732cd76fd 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -3,7 +3,7 @@ , ed, glibc, libevent }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { name = "netatalk-3.1.12"; src = fetchurl { |