commit ad200bb5bccb6b607ceb4fc6e02ecba1d5b6021c · pyrox.dev/nixpkgs

+2 -2

pkgs/applications/graphics/sane/xsane.nix

···

       1
       1
       -
       { stdenv, fetchurl, sane-backends, saneFrontends, libX11, gtk, pkgconfig, libpng

     

       1
       1
       +
       { stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng

     

       2
       2
        
       , libusb ? null

     

       3
       3
        
       , gimpSupport ? false, gimp_2_8 ? null

     

       4
       4
        
       }:

     
···

       18
       18
        
           chmod a+rX -R .

     

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [libpng sane-backends saneFrontends libX11 gtk pkgconfig ]

     

       21
       21
       +
         buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ]

     

       22
       22
        
           ++ (if libusb != null then [libusb] else [])

     

       23
       23
        
           ++ stdenv.lib.optional gimpSupport gimp_2_8;

     

       24
       24

+3 -3

pkgs/development/haskell-modules/hackage-packages.nix

···

       35450
       35450
        
            }) {};

     

       35451
       35451
        
       

     

       35452
       35452
        
         "bindings-sane" = callPackage

     

       35453
       35453
       -
           ({ mkDerivation, base, bindings-DSL, saneBackends }:

     

       35453
       35453
       +
           ({ mkDerivation, base, bindings-DSL, sane-backends }:

     

       35454
       35454
        
            mkDerivation {

     

       35455
       35455
        
              pname = "bindings-sane";

     

       35456
       35456
        
              version = "0.0.1";

     

       35457
       35457
        
              sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b";

     

       35458
       35458
        
              libraryHaskellDepends = [ base bindings-DSL ];

     

       35459
       35459
       -
              libraryPkgconfigDepends = [ saneBackends ];

     

       35459
       35459
       +
              libraryPkgconfigDepends = [ sane-backends ];

     

       35460
       35460
        
              homepage = "http://floss.scru.org/bindings-sane";

     

       35461
       35461
        
              description = "FFI bindings to libsane";

     

       35462
       35462
        
              license = stdenv.lib.licenses.gpl3;

     

       35463
       35463
        
              hydraPlatforms = [ "i686-linux" "x86_64-linux" ];

     

       35464
       35464
       -
            }) {saneBackends = null;};

     

       35464
       35464
       +
            }) {sane-backends = null;};

     

       35465
       35465
        
       

     

       35466
       35466
        
         "bindings-sc3" = callPackage

     

       35467
       35467
        
           ({ mkDerivation, base, bindings-DSL, scsynth }: