diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-08-22 16:59:31 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-22 16:59:31 +0400 |
| commit | 9db19905befc044f1634013d58c1d79dd2d228c8 (patch) | |
| tree | 383c1ee1a11af64f3e863e0611f8c48522749837 /pkgs | |
| parent | b8b668fc031a855518d141b4f528e2d7836dc577 (diff) | |
| parent | 8d8208c771d5b5c612ad09cea6de56360ff7bef6 (diff) | |
| download | nixpkgs-9db19905befc044f1634013d58c1d79dd2d228c8.tar nixpkgs-9db19905befc044f1634013d58c1d79dd2d228c8.tar.gz nixpkgs-9db19905befc044f1634013d58c1d79dd2d228c8.tar.bz2 nixpkgs-9db19905befc044f1634013d58c1d79dd2d228c8.tar.lz nixpkgs-9db19905befc044f1634013d58c1d79dd2d228c8.tar.xz nixpkgs-9db19905befc044f1634013d58c1d79dd2d228c8.tar.zst nixpkgs-9db19905befc044f1634013d58c1d79dd2d228c8.zip | |
Merge pull request #17909 from womfoo/fix/arx-libertatis-build
arx-libertatis: fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/arx-libertatis/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 12f8efd7325..b9f78ca364a 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -18,9 +18,11 @@ stdenv.mkDerivation rec { optipng imagemagick ]; - preConfigure = '' - cmakeFlags="-DDATA_DIR_PREFIXES=$out/share" - ''; + cmakeFlags = [ + "-DDATA_DIR_PREFIXES=$out/share" + "-DImageMagick_convert_EXECUTABLE=${imagemagick.out}/bin/convert" + "-DImageMagick_mogrify_EXECUTABLE=${imagemagick.out}/bin/mogrify" + ]; enableParallelBuilding = true; |