From f6350b4568ee50d3c90aa883ca0cd9eee1410448 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sun, 26 May 2013 18:13:25 +0200 Subject: [PATCH] NIX: Grab specfile from lvm2Nix (at least for now). --- release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.nix b/release.nix index 8ca13dbc1..981609f29 100644 --- a/release.nix +++ b/release.nix @@ -1,4 +1,4 @@ -{ nixpkgs ? , lvm2Src, release ? false, rawhide32 ? "" , rawhide64 ? "" , fc19_32 ? "" , fc19_64 ? "" }: +{ nixpkgs ? , lvm2Src, release ? false, rawhide32 ? "" , rawhide64 ? "" , fc19_32 ? "" , fc19_64 ? "", lvm2Nix ? lvm2Src }: let pkgs = import nixpkgs {}; @@ -138,7 +138,7 @@ let version=`cat VERSION | cut "-d(" -f1`${versionSuffix} version_dm=`cat VERSION_DM | cut "-d-" -f1`${versionSuffix} sed -e s,-git,${versionSuffix}, -i VERSION VERSION_DM - mv spec/* . && rmdir spec + rm -rf spec; cp -R ${lvm2Nix}/spec/* . chmod u+w * (echo "%define enable_profiling 1"; echo "%define check_commands \\";