working lightlyshader

LightlyShaders/default.nix

@@ -2,22 +2,22 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qt5.qtbase,
-  qt5.qtx11extras,
-  qt5.qttools,
-  libsForQt5.kglobalaccel,
-  libsForQt5.kinit,
-  libsForQt5.kwin,
-  libsForQt5.kio,
-  libsForQt5.kguiaddons,
-  libsForQt5.kcoreaddons,
-  libsForQt5.systemsettings,
-  libsForQt5.plasma-framework,
+  qtbase,
+  qtx11extras,
+  qttools,
+  kglobalaccel,
+  kinit,
+  kwin,
+  kio,
+  kguiaddons,
+  kcoreaddons,
+  systemsettings,
+  plasma-framework,
   cmake,
   extra-cmake-modules,
   clang,
   libepoxy,
-  xorg.libXdmcp
+  libXdmcp
 }:
 
 stdenv.mkDerivation rec {
@@ -33,27 +33,27 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
-  buildInputs = with pkgs; [
-    qt5.qtbase
-    qt5.qtx11extras
-    qt5.qttools
-    libsForQt5.kglobalaccel
-    libsForQt5.kinit
-    libsForQt5.kwin
-    libsForQt5.kio
-    libsForQt5.kguiaddons
-    libsForQt5.kcoreaddons
-    libsForQt5.systemsettings
-    libsForQt5.plasma-framework
+  buildInputs = [
+    qtbase
+    qtx11extras
+    qttools
+    kglobalaccel
+    kinit
+    kwin
+    kio
+    kguiaddons
+    kcoreaddons
+    systemsettings
+    plasma-framework
   ];
 
-  nativeBuildInputs = with pkgs; [
+  nativeBuildInputs = [
     stdenv
     cmake
     extra-cmake-modules
     clang
     libepoxy
-    xorg.libXdmcp
+    libXdmcp
   ];
 
   preConfigure = ''

README.org

@@ -259,7 +259,7 @@ fennel
 Let's create our own custom LightlyShaders package. This is in it's own file for now.
 #+NAME: lightlyshaders
 #+begin_src nix
-(libsForQt5.callPackage ../../pkgs/LightlyShaders {})
+(libsForQt5.callPackage ../../LightlyShaders {})
 #+end_src
 
 
@@ -270,7 +270,7 @@ nixpkgs.overlays = [
 
   (import (builtins.fetchTarball {
     url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
-    sha256 = "1rhmvww15mkix7fg8gd7r5hwlszi4zlwzxyr02yfwfsf5hh0n0d9";
+    sha256 = "09rsqmz7i7lyays59b9600z11qqr6h6lcskw1zzp54yw2csxn2ix";
   }))
 
   (self: super:

system/kaladin/configuration.nix

@@ -215,8 +215,6 @@
     libsForQt5.kirigami2
     libsForQt5.ki18n
     libsForQt5.kcoreaddons
-    libsForQt5.kdbusaddons
-    libsForQt5.libdbusmenu
     fennel
   ];
 
@@ -224,7 +222,7 @@
   
     (import (builtins.fetchTarball {
       url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
-      sha256 = "1rhmvww15mkix7fg8gd7r5hwlszi4zlwzxyr02yfwfsf5hh0n0d9";
+      sha256 = "09rsqmz7i7lyays59b9600z11qqr6h6lcskw1zzp54yw2csxn2ix";
     }))
   
     (self: super:

system/syl/configuration.nix

@@ -250,17 +250,15 @@
     libsForQt5.kirigami2
     libsForQt5.ki18n
     libsForQt5.kcoreaddons
-    libsForQt5.kdbusaddons
-    libsForQt5.libdbusmenu
     fennel
-    (libsForQt5.callPackage ../../pkgs/LightlyShaders {})
+    (libsForQt5.callPackage ../../LightlyShaders {})
   ];
 
   nixpkgs.overlays = [
   
     (import (builtins.fetchTarball {
       url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
-      sha256 = "1rhmvww15mkix7fg8gd7r5hwlszi4zlwzxyr02yfwfsf5hh0n0d9";
+      sha256 = "09rsqmz7i7lyays59b9600z11qqr6h6lcskw1zzp54yw2csxn2ix";
     }))
   
     (self: super: