diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
| commit | f19eb635b4585f6ba4f9f4c3e9e07f56623446f5 (patch) | |
| tree | 4d64a15e34e8a2b54466ba165297a6bb08bfb280 /pkgs/tools/filesystems | |
| parent | 0e4e47512d709e93c35fa575dd82e3e6ce4f884d (diff) | |
| parent | 2be707eca80b573c931007de78c936d49ab45395 (diff) | |
| download | nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.gz nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.bz2 nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.lz nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.xz nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.zst nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.zip | |
Merge branch 'master' into staging-next
https://github.com/NixOS/nixpkgs/commit/b04fc593e7b55fe1f74421b11589f12a339c92e2 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/e2fsprogs/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index f846bf1f2001..f26a41ce1426 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, shared ? true }: +{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo +, shared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "e2fsprogs"; |