diff options
author | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
commit | 2d382f3d981fc9e4a350badb43736c252415d27c (patch) | |
tree | 3d5f7a96aa71be52c86f3c243b23424e319cc286 /pkgs/development/libraries/opencascade | |
parent | 365379857fb561df949fc841e80458e317a1d682 (diff) | |
parent | 2661511cdb39bd7612dd5311b46420785fc1eac8 (diff) | |
download | nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar.gz nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar.bz2 nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar.lz nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar.xz nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar.zst nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/libraries/opencascade')
-rw-r--r-- | pkgs/development/libraries/opencascade/6.5.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/opencascade/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix index 86ab85cbb9a..252a6bb0ad1 100644 --- a/pkgs/development/libraries/opencascade/6.5.nix +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; + configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype.dev}" ]; postInstall = '' mv $out/inc $out/include diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 79c24be7514..8a7f9970e65 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preUnpack = '' sourceRoot=`pwd`/ros/adm/cmake - cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" + cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype.dev}" ''; # https://bugs.freedesktop.org/show_bug.cgi?id=83631 |