diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-24 09:19:43 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-24 09:19:43 +0200 |
commit | 7db611f2af869bac6e31ba814a5593c52d54ec19 (patch) | |
tree | ccb2231a8e0500eaeac92ac9f7a4a7f0c674ea43 /pkgs/applications/graphics | |
parent | 8987547106fcc1868cbc05fb295e0631d8edf138 (diff) | |
parent | e78fd235649e52180198f9f65ca9f172f8fe8161 (diff) | |
download | nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.gz nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.bz2 nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.lz nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.xz nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.zst nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.zip |
Merge branch 'staging'
Includes libX11 security update.
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/exrtools/default.nix | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index 01af81d4de7..7980d09fed1 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -9,11 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; - preConfigure = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ - ''; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ stdenv openexr libpng12 libjpeg ]; |