diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
| commit | 96cec2a7bdf2482ae58fe04cce5e87a1eec644f9 (patch) | |
| tree | ea48b901c9ba0ac2b4a249ae94bd966c4a025001 /pkgs/development/libraries/libjpeg | |
| parent | db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28 (diff) | |
| parent | 084626deecaffcaa017af07eaab00682eff5d6f3 (diff) | |
| download | nixpkgs-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar nixpkgs-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.gz nixpkgs-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.bz2 nixpkgs-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.lz nixpkgs-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.xz nixpkgs-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.zst nixpkgs-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.zip | |
Merge 'staging' into multiple-outputs
Conflicts: pkgs/applications/audio/flac/default.nix pkgs/build-support/gcc-wrapper/builder.sh pkgs/development/libraries/apr-util/default.nix pkgs/development/libraries/apr/default.nix pkgs/development/libraries/atk/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/builder.sh pkgs/development/libraries/glibc/2.17/locales.nix pkgs/development/libraries/libjpeg/default.nix pkgs/development/libraries/libogg/default.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/libvorbis/default.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/pango/default.nix pkgs/development/web/nodejs/default.nix pkgs/os-specific/linux/pam/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/stdenv/generic/setup.sh pkgs/stdenv/linux/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-small.nix
Diffstat (limited to 'pkgs/development/libraries/libjpeg')
| -rw-r--r-- | pkgs/development/libraries/libjpeg/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 166f399dc25..8884546bcdf 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, static ? false }: + +with stdenv.lib; stdenv.mkDerivation { name = "libjpeg-8d"; @@ -8,6 +10,8 @@ stdenv.mkDerivation { sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; }; + configureFlags = optional static "--enable-static --disable-shared"; + outputs = [ "dev" "out" "man" "bin" ]; meta = { |