pyrox.dev / nixpkgs
lol
fork atom

libgphoto2: fix build of all camlibs

The camlibs `lumix` and `docupen` were excluded from compilation and
bundling due to the missing depdendencies.

authored by

Francesco Zanini and committed by
Alyssa Ross ca09b01f 47fbfa2a

+28 -13
unified split
+28 -13
pkgs/development/libraries/libgphoto2/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, buildPackages 2 - , autoreconfHook, pkg-config, gettext 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , buildPackages 5 + , autoreconfHook 6 + , pkg-config 7 + , gettext 3 8 , libusb1 4 9 , libtool 5 10 , libexif 6 11 , libgphoto2 7 12 , libjpeg 13 + , curl 14 + , libxml2 15 + , gd 8 16 }: 9 17 10 18 stdenv.mkDerivation rec { ··· 24 32 autoreconfHook 25 33 gettext 26 34 libtool 35 + pkg-config 27 36 ]; 28 37 29 38 buildInputs = [ 30 39 libjpeg 31 40 libtool # for libltdl 32 41 libusb1 42 + curl 43 + libxml2 44 + gd 33 45 ]; 34 46 35 47 # These are mentioned in the Requires line of libgphoto's pkg-config file. ··· 37 49 38 50 hardeningDisable = [ "format" ]; 39 51 40 - postInstall = let 41 - executablePrefix = if stdenv.buildPlatform == stdenv.hostPlatform then 42 - "$out" 43 - else 44 - buildPackages.libgphoto2; 45 - in '' 46 - mkdir -p $out/lib/udev/rules.d 47 - ${executablePrefix}/lib/libgphoto2/print-camera-list \ 48 - udev-rules version 175 group camera \ 49 - >$out/lib/udev/rules.d/40-gphoto2.rules 50 - ''; 52 + postInstall = 53 + let 54 + executablePrefix = 55 + if stdenv.buildPlatform == stdenv.hostPlatform then 56 + "$out" 57 + else 58 + buildPackages.libgphoto2; 59 + in 60 + '' 61 + mkdir -p $out/lib/udev/rules.d 62 + ${executablePrefix}/lib/libgphoto2/print-camera-list \ 63 + udev-rules version 175 group camera \ 64 + >$out/lib/udev/rules.d/40-gphoto2.rules 65 + ''; 51 66 52 67 meta = { 53 68 homepage = "http://www.gphoto.org/proj/libgphoto2/";