From f7918e6f0a9f93bd229096a76e5ed6f00e62bc41 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Thu, 9 Aug 2018 14:26:43 +0200
Subject: Hopefully understood inputs

---
 default.nix | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 423f02d..3318590 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,5 @@
 {
-  nixpkgs ? import <nixpkgs> {},
+  nixpkgs ? <nixpkgs>,
 
   kasyncSrc ? nixpkgs.fetchgit {
     url = "https://anongit.kde.org/kasync.git";
@@ -31,16 +31,19 @@
 
   kubeSrc,
 
+  compiler ? "gcc7",
   cmakeBuildType ? "Debug"
 }:
 
 let
-    stdenv = nixpkgs.stdenv;
+  pkgs = import nixpkgs {},
+  stdenv = pkgs.overrideCC pkgs.stdenv pkgs.${compiler};
+
 in rec {
     kasync = stdenv.mkDerivation {
         name = "kasync";
-        nativeBuildInputs = with nixpkgs; [ cmake ninja ccache ];
-        buildInputs = with nixpkgs; with qt5;
+        nativeBuildInputs = with pkgs; [ cmake ninja ccache ];
+        buildInputs = with pkgs; with qt5;
         [ extra-cmake-modules qtbase ];
 
         src = kasyncSrc;
@@ -50,8 +53,8 @@ in rec {
 
     kimap2 = stdenv.mkDerivation {
         name = "kimap2";
-        nativeBuildInputs = with nixpkgs; [ cmake ninja ccache ];
-        buildInputs = with nixpkgs; with qt5; with kdeFrameworks;
+        nativeBuildInputs = with pkgs; [ cmake ninja ccache ];
+        buildInputs = with pkgs; with qt5; with kdeFrameworks;
         [ extra-cmake-modules qtbase kcoreaddons kcodecs kdeApplications.kmime cyrus_sasl ];
 
         src = kimap2Src;
@@ -60,8 +63,8 @@ in rec {
 
     kdav2 = stdenv.mkDerivation {
         name = "kdav2";
-        nativeBuildInputs = with nixpkgs; [ cmake ninja ccache ];
-        buildInputs = with nixpkgs; with qt5; with kdeFrameworks;
+        nativeBuildInputs = with pkgs; [ cmake ninja ccache ];
+        buildInputs = with pkgs; with qt5; with kdeFrameworks;
         [ extra-cmake-modules qtbase qtxmlpatterns kcoreaddons ];
 
         src = kdav2Src;
@@ -71,8 +74,8 @@ in rec {
 
     sink = stdenv.mkDerivation {
         name = "sink";
-        nativeBuildInputs = with nixpkgs; [ cmake ninja ccache ];
-        buildInputs = with nixpkgs; with qt5; with kdeApplications;
+        nativeBuildInputs = with pkgs; [ cmake ninja ccache ];
+        buildInputs = with pkgs; with qt5; with kdeApplications;
         [
             extra-cmake-modules kmime kcontacts kcalcore
             flatbuffers lmdb xapian cyrus_sasl curl libgit2 readline
@@ -93,8 +96,8 @@ in rec {
 
     kube = stdenv.mkDerivation {
         name = "kube";
-        nativeBuildInputs = with nixpkgs; [ cmake ninja ccache ];
-        buildInputs = with nixpkgs; with qt5; with kdeFrameworks; with kdeApplications; with libsForQt5;
+        nativeBuildInputs = with pkgs; [ cmake ninja ccache ];
+        buildInputs = with pkgs; with qt5; with kdeFrameworks; with kdeApplications; with libsForQt5;
         [
             extra-cmake-modules kcalcore kcodecs kcontacts kmime
             qtbase qtquickcontrols2 qtwebengine qgpgme
@@ -107,7 +110,7 @@ in rec {
         CCACHE_UMASK = "007";
 
         cmakeFlags = [
-            #"-DCMAKE_CXX_COMPILER_LAUNCHER=${nixpkgs.ccache}/bin/ccache"
+            #"-DCMAKE_CXX_COMPILER_LAUNCHER=${pkgs.ccache}/bin/ccache"
             "-DCMAKE_CXX_FLAGS=-fdiagnostics-color=always"
             "-DCMAKE_EXPORT_COMPILE_COMMANDS=1"
         ];
-- 
cgit v1.2.3