From dfb3b88ada5c6376d125668224aba6ce5ed3f205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 01:10:39 -0300 Subject: [PATCH] packages: extract lipsum --- flake.lock | 17 ----------------- flake.nix | 3 --- pkgs/default.nix | 2 +- pkgs/lipsum.nix | 19 +++++++++++++++---- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 9689596..9b990c7 100644 --- a/flake.lock +++ b/flake.lock @@ -544,22 +544,6 @@ "type": "github" } }, - "lipsum": { - "flake": false, - "locked": { - "lastModified": 1630421397, - "narHash": "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo=", - "owner": "hannenz", - "repo": "lipsum", - "rev": "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed", - "type": "github" - }, - "original": { - "owner": "hannenz", - "repo": "lipsum", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -788,7 +772,6 @@ "dzgui-nix": "dzgui-nix", "home-manager": "home-manager_2", "hyprland": "hyprland", - "lipsum": "lipsum", "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", diff --git a/flake.nix b/flake.nix index da9130f..fd2fc09 100644 --- a/flake.nix +++ b/flake.nix @@ -21,9 +21,6 @@ plymouth-themes.url = "github:adi1090x/plymouth-themes"; plymouth-themes.flake = false; - lipsum.url = "github:hannenz/lipsum"; - lipsum.flake = false; - agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 391ab1b..4bfc896 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,7 +5,7 @@ { blade-formatter = pkgs.callPackage ./blade-formatter { }; cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; - lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; }; + lipsum = pkgs.callPackage ./lipsum.nix { }; emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; } diff --git a/pkgs/lipsum.nix b/pkgs/lipsum.nix index 427f04e..de1b75a 100644 --- a/pkgs/lipsum.nix +++ b/pkgs/lipsum.nix @@ -1,11 +1,22 @@ -{ pkgs, inputs }: -pkgs.stdenv.mkDerivation rec { +{ + stdenv, + fetchFromGitHub, + pkg-config, + vala, + wrapGAppsHook, +}: +stdenv.mkDerivation rec { pname = "lipsum"; version = "0.0.1"; - src = inputs.lipsum; + src = fetchFromGitHub { + owner = "hannenz"; + repo = "lipsum"; + rev = "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed"; + hash = "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo="; + }; - nativeBuildInputs = with pkgs; [ + nativeBuildInputs = [ pkg-config vala wrapGAppsHook