diff options
| author | Francesco Zanini <francesco@zanini.me> | 2021-11-29 09:50:42 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-11-30 22:06:45 +0000 |
| commit | ca09b01f37c1db288a72aec8363fd56dfc6b7a92 (patch) | |
| tree | 3886b692f1419514aaf8dc9b1d0edff021150b24 | |
| parent | 47fbfa2a57aa0e62ac21daa893a9b126758ba3df (diff) | |
libgphoto2: fix build of all camlibs
The camlibs `lumix` and `docupen` were excluded from compilation and bundling due to the missing depdendencies.
| -rw-r--r-- | pkgs/development/libraries/libgphoto2/default.nix | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 666135f91bb98..63015fdf6cb36 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,10 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages -, autoreconfHook, pkg-config, gettext +{ lib +, stdenv +, fetchFromGitHub +, buildPackages +, autoreconfHook +, pkg-config +, gettext , libusb1 , libtool , libexif , libgphoto2 , libjpeg +, curl +, libxml2 +, gd }: stdenv.mkDerivation rec { @@ -24,12 +32,16 @@ stdenv.mkDerivation rec { autoreconfHook gettext libtool + pkg-config ]; buildInputs = [ libjpeg libtool # for libltdl libusb1 + curl + libxml2 + gd ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. @@ -37,17 +49,20 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - postInstall = let - executablePrefix = if stdenv.buildPlatform == stdenv.hostPlatform then - "$out" - else - buildPackages.libgphoto2; - in '' - mkdir -p $out/lib/udev/rules.d - ${executablePrefix}/lib/libgphoto2/print-camera-list \ - udev-rules version 175 group camera \ - >$out/lib/udev/rules.d/40-gphoto2.rules - ''; + postInstall = + let + executablePrefix = + if stdenv.buildPlatform == stdenv.hostPlatform then + "$out" + else + buildPackages.libgphoto2; + in + '' + mkdir -p $out/lib/udev/rules.d + ${executablePrefix}/lib/libgphoto2/print-camera-list \ + udev-rules version 175 group camera \ + >$out/lib/udev/rules.d/40-gphoto2.rules + ''; meta = { homepage = "http://www.gphoto.org/proj/libgphoto2/"; |