diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-06 12:14:52 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-06 12:14:52 +0100 |
| commit | 10a12194e301f2ad3ff6899e022afa96af0610c8 (patch) | |
| tree | 9c33b65e84504d37635d942a91bc5aa0b075058d /pkgs/applications/graphics | |
| parent | 5489e49ebb5cb9b973133fcd70d3196fb12acc0b (diff) | |
| parent | 981b504ecddd981488578494304d141849697dba (diff) | |
| download | nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.gz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.bz2 nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.lz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.xz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.zst nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.zip | |
Merge #53490: fix treewide linking errors after #51770
Issue #53001. This might not be all of them, but let's not wait.
Diffstat (limited to 'pkgs/applications/graphics')
5 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 52df41c683cd..6668bc42a8b5 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base ] ++ stdenv.lib.optional useUnrar unrar; + NIX_LDFLAGS = [ + "-lpthread" + ]; + postPatch = ''patchShebangs version.sh''; postInstall = '' diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index 5fd1810bc284..c64604975ab0 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -10,6 +10,13 @@ stdenv.mkDerivation { buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ]; + patches = [ + (fetchurl { + url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch; + sha256 = "1bfcr5sps0ip9gl4jprji5jgf9wkczz6d2clsjjlbsy8r3ixi3lv"; + }) + ]; + meta = { homepage = http://hugin.sourceforge.net/; description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 9c736f5ffb57..14c7bb1be61a 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - NIX_LDFLAGS = "-llcms -ljpeg -lX11"; + NIX_LDFLAGS = "-lm -llcms -ljpeg -lpng -lX11"; meta = { homepage = http://www.cinepaint.org/; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index c553b7cf60c4..71ee715b535d 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; + NIX_LDFLAGS = [ + "-lpthread" + ]; buildPhase = '' make release diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 75140bd005d5..205376b1257c 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + NIX_LDFLAGS = [ + "-lm" + ]; + meta = with stdenv.lib; { description = "A fast image viewer"; homepage = http://gqview.sourceforge.net; |