working lightlyshader

This commit is contained in:
Chris Cochrun 2022-05-18 09:42:13 -05:00
parent d9ab256bb3
commit 7e185fb489
4 changed files with 31 additions and 35 deletions

View file

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

View file

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

View file

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

View file

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