diff options
author | Robin Gloster <mail@glob.in> | 2017-01-27 16:26:41 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-01-27 17:36:38 +0100 |
commit | 0cd1f6bb51779d2722931e188f3c94e5366ce32d (patch) | |
tree | 7473a483693b61a79a47efdb299b69c7cbae8b7e | |
parent | ae3fc70edecf1b4683cd66d9600df3e97c93bb29 (diff) | |
download | nixpkgs-0cd1f6bb51779d2722931e188f3c94e5366ce32d.tar nixpkgs-0cd1f6bb51779d2722931e188f3c94e5366ce32d.tar.gz nixpkgs-0cd1f6bb51779d2722931e188f3c94e5366ce32d.tar.bz2 nixpkgs-0cd1f6bb51779d2722931e188f3c94e5366ce32d.tar.lz nixpkgs-0cd1f6bb51779d2722931e188f3c94e5366ce32d.tar.xz nixpkgs-0cd1f6bb51779d2722931e188f3c94e5366ce32d.tar.zst nixpkgs-0cd1f6bb51779d2722931e188f3c94e5366ce32d.zip |
gxemul: get rid of composableDerivation
-rw-r--r-- | pkgs/misc/emulators/gxemul/default.nix | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index ba1b63855e3..ea2d6bbfecc 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/; }; - } |