about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-02-21 10:06:49 +0000
committerRobin Gloster <mail@glob.in>2016-02-21 10:06:49 +0000
commit58c377b9aa7a54f6e3f216c228a8556dff9a6929 (patch)
treee9ca6a025ef64861f161902455515e008d477555 /pkgs/top-level
parent3fead71a0e53fabd568495a771ee518ebdb8d051 (diff)
downloadnixlib-58c377b9aa7a54f6e3f216c228a8556dff9a6929.tar
nixlib-58c377b9aa7a54f6e3f216c228a8556dff9a6929.tar.gz
nixlib-58c377b9aa7a54f6e3f216c228a8556dff9a6929.tar.bz2
nixlib-58c377b9aa7a54f6e3f216c228a8556dff9a6929.tar.lz
nixlib-58c377b9aa7a54f6e3f216c228a8556dff9a6929.tar.xz
nixlib-58c377b9aa7a54f6e3f216c228a8556dff9a6929.tar.zst
nixlib-58c377b9aa7a54f6e3f216c228a8556dff9a6929.zip
kde5.calamares: 1.0 -> 1.1.4.2
fixes build and removes obsolete PIC handling
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4df410328473..65789fd040db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14964,18 +14964,17 @@ let
 
     calamares = callPackage ../tools/misc/calamares rec {
       python = python3;
-      boost = pkgs.boost.override { python=python3; };
-      libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
+      boost = pkgs.boost.override { python = python3; };
+      libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost = boost; };
     };
 
     dfilemanager = callPackage ../applications/misc/dfilemanager { };
 
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
 
-    k9copy = callPackage ../applications/video/k9copy {};
+    k9copy = callPackage ../applications/video/k9copy { };
 
-    konversation = callPackage ../applications/networking/irc/konversation/1.6.nix {
-    };
+    konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { };
 
     quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix {
       monolithic = true;