first attempt at adding lightlyshaders permanentlly

This commit is contained in:
Chris Cochrun 2022-05-18 09:20:09 -05:00
parent 61a89f8dca
commit d9ab256bb3
7 changed files with 54 additions and 13 deletions

View file

@ -1 +0,0 @@
/nix/store/536f45xscv3kn737xxkwby50nwcsi035-LightlyShaders-0.0.1

View file

@ -1,13 +1,28 @@
{
pkgs ? import <nixpkgs> {},
stdenv ? pkgs.stdenv,
lib ? pkgs.lib,
fetchFromGitHub ? pkgs.fetchFromGitHub,
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,
cmake,
extra-cmake-modules,
clang,
libepoxy,
xorg.libXdmcp
}:
stdenv.mkDerivation rec {
pname = "LightlyShaders";
version = "0.0.1";
version = "0.0.2";
src = fetchFromGitHub {
owner = "a-parhom";
@ -48,7 +63,7 @@ stdenv.mkDerivation rec {
substituteInPlace CMakeLists.txt \
--replace "\''${MODULEPATH}" "$out/''${modulepath#/nix/store/*/}" \
--replace "\''${DATAPATH}" "$out/''${datapath#/nix/store/*/}" \
--replace "\''${DATAPATH}" "$out/''${servicepath#/nix/store/*/}"
--replace "\''${SERVICEPATH}" "$out/''${servicepath#/nix/store/*/}"
'';
meta = with lib; {

1
LightlyShaders/result Symbolic link
View file

@ -0,0 +1 @@
/nix/store/l5xy1js7xmgvdcn1z13mbd595p6zprqd-LightlyShaders-0.0.2

View file

@ -44,6 +44,7 @@ Both include the home-manager module. Primarily I chose that route so that I cou
};
lib = nixpkgs.lib;
in {
nixosConfigurations = {
syl = lib.nixosSystem {
@ -255,6 +256,13 @@ libsForQt5.kcoreaddons
fennel
#+end_src
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 {})
#+end_src
Here are the two main overlays I like to use. One for Emacs and another for the AwesomeWM.
#+NAME: overlays
#+begin_src nix
@ -417,6 +425,7 @@ Notice how I am including all of my software here. It may be a big file, but hav
macchina
# Dev tools
<<dev-tools>>
<<lightlyshaders>>
];
<<overlays>>

View file

@ -18,6 +18,7 @@
};
lib = nixpkgs.lib;
in {
nixosConfigurations = {
syl = lib.nixosSystem {

View file

@ -1,13 +1,28 @@
{
pkgs ? import <nixpkgs> {},
stdenv ? pkgs.stdenv,
lib ? pkgs.lib,
fetchFromGitHub ? pkgs.fetchFromGitHub,
stdenv,
lib,
fetchFromGitHub,
qt5.qtbase,
qt5.qtx11extras,
qt5.qttools,
kglobalaccel,
kinit,
kwin,
kio,
kguiaddons,
kcoreaddons,
systemsettings,
plasma-framework,
cmake,
extra-cmake-modules,
clang,
libepoxy,
xorg.libXdmcp
}:
stdenv.mkDerivation rec {
pname = "LightlyShaders";
version = "0.0.1";
version = "0.0.2";
src = fetchFromGitHub {
owner = "a-parhom";
@ -48,7 +63,7 @@ stdenv.mkDerivation rec {
substituteInPlace CMakeLists.txt \
--replace "\''${MODULEPATH}" "$out/''${modulepath#/nix/store/*/}" \
--replace "\''${DATAPATH}" "$out/''${datapath#/nix/store/*/}" \
--replace "\''${DATAPATH}" "$out/''${servicepath#/nix/store/*/}"
--replace "\''${SERVICEPATH}" "$out/''${servicepath#/nix/store/*/}"
'';
meta = with lib; {

View file

@ -253,6 +253,7 @@
libsForQt5.kdbusaddons
libsForQt5.libdbusmenu
fennel
(libsForQt5.callPackage ../../pkgs/LightlyShaders {})
];
nixpkgs.overlays = [