From 7d41e83b4f62c8f79be4a0e984a11941d55e66dc Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Thu, 29 Dec 2022 11:27:27 +0100 Subject: Replace default.nix by flake --- default.nix | 25 ------------------------- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 29 +++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 25 deletions(-) delete mode 100644 default.nix create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/default.nix b/default.nix deleted file mode 100644 index 38f3d65..0000000 --- a/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ system ? builtins.currentSystem }: - -let - pkgs = import { inherit system; }; - stdenv = pkgs.stdenv; - -in stdenv.mkDerivation rec { - name = "input-xslt"; - - src = pkgs.lib.cleanSource ./.; - - buildInputs = with pkgs; [ - cmake boost xalanc xercesc discount - ]; - - meta = with stdenv.lib; { - description = "InputXSLT"; - homepage = https://tree.kummerlaender.eu/projects/xslt/input_xslt/; - license = stdenv.lib.licenses.asl20; - }; - - shellHook = '' - export NIX_SHELL_NAME="${name}" - ''; -} diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..42b6658 --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..76820d8 --- /dev/null +++ b/flake.nix @@ -0,0 +1,29 @@ +{ + description = "InputXSLT"; + + inputs = { + nixpkgs.url = github:NixOS/nixpkgs/nixos-21.05; + }; + + outputs = { self, nixpkgs, ... }: { + defaultPackage.x86_64-linux = let + system = "x86_64-linux"; + pkgs = import nixpkgs { inherit system; }; + + in pkgs.stdenv.mkDerivation rec { + name = "input-xslt"; + + src = pkgs.lib.cleanSource ./.; + + buildInputs = with pkgs; [ + cmake boost xalanc xercesc discount + ]; + + meta = { + description = "InputXSLT"; + homepage = https://tree.kummerlaender.eu/projects/xslt/input_xslt/; + license = pkgs.lib.licenses.asl20; + }; + }; + }; +} -- cgit v1.2.3