From 0cd1f6bb51779d2722931e188f3c94e5366ce32d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 27 Jan 2017 16:26:41 +0100 Subject: [PATCH] gxemul: get rid of composableDerivation --- pkgs/misc/emulators/gxemul/default.nix | 36 +++++++++----------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index ba1b63855e34..ea2d6bbfecc8 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/misc/emulators/gxemul/default.nix @@ -1,12 +1,8 @@ -{ stdenv, composableDerivation, fetchurl }: +{ stdenv, fetchurl }: -let edf = composableDerivation.edf; - version = "0.6.0.1"; - name = "gxemul-${version}"; -in - -composableDerivation.composableDerivation {} { - inherit name; +stdenv.mkDerivation rec { + name = "gxemul-${version}"; + version = "0.6.0.1"; src = fetchurl { url = "http://gxemul.sourceforge.net/src/${name}.tar.gz"; @@ -15,21 +11,14 @@ composableDerivation.composableDerivation {} { configurePhase = "./configure"; - installPhase = "mkdir -p \$out/bin; cp gxemul \$out/bin;"; - - mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; }; - - flags = { - doc = { installPhase = "mkdir -p \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; }; - demos = { installPhase = "mkdir -p \$out/share/${name}; cp -r demos \$out/share/${name};"; }; - man = { installPhase = "cp -r ./man \$out/;";}; - }; - - cfg = { - docSupport = true; - demosSupport = true; - manSupport = true; - }; + installPhase = '' + mkdir -p $out/bin; + mkdir -p $out/share/${name}; + cp gxemul $out/bin; + cp -r doc $out/share/${name}; + cp -r demos $out/share/${name}; + cp -r ./man $out/; + ''; meta = { license = stdenv.lib.licenses.bsd3; @@ -45,5 +34,4 @@ composableDerivation.composableDerivation {} { ''; homepage = http://gxemul.sourceforge.net/; }; - }