From 8cc2d64444b0946abb0009058865cd46165b69c4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Sep 2019 00:06:50 +0200 Subject: flake.nix: Provide a Nixpkgs overlay Also update the lock file. --- flake.lock | 7 ++++--- flake.nix | 14 +++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index fa5649c..70a433b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,9 +2,10 @@ "inputs": { "nixpkgs": { "inputs": {}, - "narHash": "sha256-TrLhI3xPkTTznE9gcMHhkHirGNN7N02zM4DxJ/U3WRs=", - "uri": "github:edolstra/nixpkgs/24bf27fc215e8300877dfa1c426b9966bbfbd150" + "narHash": "sha256-HGlE2VNbdEjCP76hWAS72kHBlMWhpvqWo58Obg1Vy6s=", + "originalUri": "nixpkgs", + "uri": "github:edolstra/nixpkgs/13e1bce51f4aebdf3db58ce8c4a93e904a272bff" } }, - "version": 2 + "version": 3 } diff --git a/flake.nix b/flake.nix index 8d570bf..e69412a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,15 @@ outputs = { self, nixpkgs }: rec { + overlay = final: prev: { + + patchelf-new = final.stdenv.mkDerivation { + name = "patchelf-${hydraJobs.tarball.version}"; + src = "${hydraJobs.tarball}/tarballs/*.tar.bz2"; + }; + + }; + hydraJobs = import ./release.nix { patchelfSrc = self; nixpkgs = nixpkgs; @@ -12,7 +21,10 @@ checks.build = hydraJobs.build.x86_64-linux; - packages.patchelf = hydraJobs.build.x86_64-linux; + packages.patchelf = (import nixpkgs { + system = "x86_64-linux"; + overlays = [ self.overlay ]; + }).patchelf-new; defaultPackage = packages.patchelf; -- cgit v0.12