From 304faa1c83175a27e37e29468ad148e67c68b6d9 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Tue, 7 Apr 2020 15:00:02 +0200
Subject: [PATCH] Simplify simpleandsoft import
---
nixos/pkgs/default.nix | 2 +-
nixos/pkgs/simpleandsoft/default.nix | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix
index 82c0654..2ff0052 100644
--- a/nixos/pkgs/default.nix
+++ b/nixos/pkgs/default.nix
@@ -11,7 +11,7 @@ let
haskell-ide-engine = (import ./haskell-ide-engine { inherit pkgs; });
neovim = import ./neovim { inherit pkgs; };
nginx-sso = callPackage ./nginx-sso {};
- simpleandsoft = (import ./simpleandsoft { inherit pkgs; }).simpleandsoft;
+ simpleandsoft = import ./simpleandsoft { inherit pkgs; };
neatvnc = callPackage ./neatvnc/neatvnc.nix {};
wayvnc = callPackage ./wayvnc/wayvnc.nix {};
diff --git a/nixos/pkgs/simpleandsoft/default.nix b/nixos/pkgs/simpleandsoft/default.nix
index 6f46e58..614dac1 100644
--- a/nixos/pkgs/simpleandsoft/default.nix
+++ b/nixos/pkgs/simpleandsoft/default.nix
@@ -1,4 +1,3 @@
{ pkgs ? import <nixpkgs> {} }:
-{
- simpleandsoft = pkgs.callPackage ./simpleandsoft.nix {};
-}
\ No newline at end of file
+
+pkgs.callPackage ./simpleandsoft.nix {}
--
GitLab