diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 17:37:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 17:38:18 +0200 |
| commit | 2d6179d1e8c15d341f0cade0ab55653623eb5038 (patch) | |
| tree | d69260a6e740c174c9616b2bb6d24a0e98ba8f6e /pkgs/tools/misc/execline/default.nix | |
| parent | 2e7cb61cfbe6df23a2e223f98ae61e1a385ea747 (diff) | |
| parent | 9a56eee0b144c1e63afc0b5c9e562da9565ea7f0 (diff) | |
| download | nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.gz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.bz2 nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.lz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.xz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.zst nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.zip | |
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
Diffstat (limited to 'pkgs/tools/misc/execline/default.nix')
| -rw-r--r-- | pkgs/tools/misc/execline/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 0b606882a5c3..360808f4280b 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${skalibs.lib}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); postInstall = '' mkdir -p $doc/share/doc/execline |