MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #36891 from volth/aliases-2

Browse source 
treewide: s/saneBackends/sane-backends/g
This commit is contained in:
Michael Raskin 2018-03-13 14:12:29 +00:00 committed by GitHub
commit 9f4aaf11bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/haskell-modules/hackage-packages.nix
View file

@ -35146,17 +35146,17 @@ self: {
}) {};
"bindings-sane" = callPackage
({ mkDerivation, base, bindings-DSL, saneBackends }:
({ mkDerivation, base, bindings-DSL, sane-backends }:
mkDerivation {
pname = "bindings-sane";
version = "0.0.1";
sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2";
libraryHaskellDepends = [ base bindings-DSL ];
libraryPkgconfigDepends = [ saneBackends ];
libraryPkgconfigDepends = [ sane-backends ];
homepage = "http://floss.scru.org/bindings-sane";
description = "FFI bindings to libsane";
license = stdenv.lib.licenses.lgpl3;
}) {inherit (pkgs) saneBackends;};
}) {inherit (pkgs) sane-backends;};
"bindings-sc3" = callPackage
({ mkDerivation, base, bindings-DSL, scsynth }:

2
pkgs/misc/emulators/wine/base.nix
View file

@ -39,7 +39,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ lib.optional vaSupport pkgs.libva-full
++ lib.optional pcapSupport pkgs.libpcap
++ lib.optional v4lSupport pkgs.libv4l
++ lib.optional saneSupport pkgs.saneBackends
++ lib.optional saneSupport pkgs.sane-backends
++ lib.optional gsmSupport pkgs.gsm
++ lib.optional gphoto2Support pkgs.libgphoto2
++ lib.optional ldapSupport pkgs.openldap