From d06db97c6da83523f36222049d8fab982d1e9e59 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 26 Apr 2019 16:22:31 +0200 Subject: [PATCH] Refactor slang build --- pkgs/slang_1/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/slang_1/default.nix b/pkgs/slang_1/default.nix index 5d68a56..3054b1d 100644 --- a/pkgs/slang_1/default.nix +++ b/pkgs/slang_1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchpatch, fetchurl }: stdenv.mkDerivation rec { name = "slang-debian-patched-${version}"; version = "1.4.9"; @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { url = "ftp://space.mit.edu/pub/davis/slang/v1.4/slang-1.4.9.tar.gz"; sha256 = "1y2mg0whqh4b3acd0k17i4biz55bimxg8aaxhmwd165cvspxns9r"; }; - debianPatches = fetchurl { - url = "http://archive.debian.org/debian-archive/debian-amd64/pool/main/s/slang/slang_1.4.9dbs-8.diff.gz"; - sha256 = "0xdq14k5ynqfwpmis1rcggs7m4n921i3bs27icbmbhfg5gb2hap2"; - }; + patches = [ + (fetchpatch { + name = "slang_1.4.9dbs-8.diff.gz"; + url = "http://archive.debian.org/debian-archive/debian-amd64/pool/main/s/slang/slang_1.4.9dbs-8.diff.gz"; + sha256 = "0xdq14k5ynqfwpmis1rcggs7m4n921i3bs27icbmbhfg5gb2hap2"; + }) + ]; preConfigure = '' - cp $debianPatches ./slang.diff.gz - gunzip slang.diff.gz - patch -p1 < slang.diff for i in debian/patches/*; do patch -p1 < $i done -- 2.41.0