public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libjpeg_turbo: fix static build

Browse Source
This commit is contained in:
Symphorien Gibol 2020-07-01 23:30:31 +02:00
parent cda852a528
commit 1aa45698d7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false }: { stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false, enableShared ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DENABLE_STATIC=${if enableStatic then "1" else "0"}" "-DENABLE_STATIC=${if enableStatic then "1" else "0"}"
"-DENABLE_SHARED=${if enableShared then "1" else "0"}"
]; ];
doInstallCheck = true; doInstallCheck = true;

4
pkgs/top-level/static.nix
View File

@ -216,6 +216,10 @@ in {
libressl = super.libressl.override { libressl = super.libressl.override {
buildShared = false; buildShared = false;
}; };
libjpeg_turbo = super.libjpeg_turbo.override {
enableStatic = true;
enableShared = false;
};
darwin = super.darwin // { darwin = super.darwin // {
libiconv = super.darwin.libiconv.override { libiconv = super.darwin.libiconv.override {