about summary refs log tree commit diff
path: root/pkgs/desktops/kde-4.14
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-01-19 09:55:31 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-01-19 09:55:31 +0100
commit716aac2519a7571e7f5fd984a886d579a4a051c5 (patch)
tree53cf89cf764d787f4dc8f08474479892b9733177 /pkgs/desktops/kde-4.14
parentf8472457a440de3c44f6f604142d678b6ae2a762 (diff)
parent53b389327e34de319dc0dbda2b6bcab1a69db69d (diff)
downloadnixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar
nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.gz
nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.bz2
nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.lz
nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.xz
nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.zst
nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.zip
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs/desktops/kde-4.14')
-rw-r--r--pkgs/desktops/kde-4.14/kdegraphics/libksane.nix4
-rw-r--r--pkgs/desktops/kde-4.14/kdeutils/print-manager.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
index 6c3543eef370..d55419f02c75 100644
--- a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
+++ b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
@@ -1,7 +1,7 @@
-{ stdenv, kde, kdelibs, saneBackends }:
+{ stdenv, kde, kdelibs, sane-backends }:
 
 kde {
-  buildInputs = [ kdelibs saneBackends ];
+  buildInputs = [ kdelibs sane-backends ];
 
   meta = {
     description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
diff --git a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
index e786c8f70419..d12c261a728d 100644
--- a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
+++ b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
@@ -1,7 +1,7 @@
 { kde, kdelibs
-, pythonPackages, cups, pyqt4, pykde4, pycups, system_config_printer }:
+, pythonPackages, cups, pyqt4, pykde4, pycups, system-config-printer }:
 
-let s_c_p = system_config_printer.override { withGUI = false; }; in
+let s_c_p = system-config-printer.override { withGUI = false; }; in
 
 kde rec {
   buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython