diff --git a/LightlyShaders-build/result b/LightlyShaders-build/result deleted file mode 120000 index a93f469..0000000 --- a/LightlyShaders-build/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/536f45xscv3kn737xxkwby50nwcsi035-LightlyShaders-0.0.1 \ No newline at end of file diff --git a/LightlyShaders-build/default.nix b/LightlyShaders/default.nix similarity index 75% rename from LightlyShaders-build/default.nix rename to LightlyShaders/default.nix index b871c83..d7ca8a9 100644 --- a/LightlyShaders-build/default.nix +++ b/LightlyShaders/default.nix @@ -1,13 +1,28 @@ { - pkgs ? import {}, - 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; { diff --git a/LightlyShaders/result b/LightlyShaders/result new file mode 120000 index 0000000..91c1118 --- /dev/null +++ b/LightlyShaders/result @@ -0,0 +1 @@ +/nix/store/l5xy1js7xmgvdcn1z13mbd595p6zprqd-LightlyShaders-0.0.2 \ No newline at end of file diff --git a/README.org b/README.org index b549f3a..8cad928 100644 --- a/README.org +++ b/README.org @@ -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 <> + <> ]; <> diff --git a/flake.nix b/flake.nix index 35704b9..53d341c 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,7 @@ }; lib = nixpkgs.lib; + in { nixosConfigurations = { syl = lib.nixosSystem { diff --git a/pkgs/LightlyShaders.nix b/pkgs/LightlyShaders.nix index b871c83..926c922 100644 --- a/pkgs/LightlyShaders.nix +++ b/pkgs/LightlyShaders.nix @@ -1,13 +1,28 @@ { - pkgs ? import {}, - 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; { diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 2bc8d8f..42f1eaf 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -253,6 +253,7 @@ libsForQt5.kdbusaddons libsForQt5.libdbusmenu fennel + (libsForQt5.callPackage ../../pkgs/LightlyShaders {}) ]; nixpkgs.overlays = [