From 9d7c387d2686c544536e928b1255872c5169720c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Apr 2015 16:15:17 +0200
Subject: untie: reimplement using mkDerivation

---
 pkgs/os-specific/linux/untie/default.nix | 48 +++++++++-----------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

(limited to 'pkgs/os-specific/linux/untie')

diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix
index 441f041e6be..d6b88bfc467 100644
--- a/pkgs/os-specific/linux/untie/default.nix
+++ b/pkgs/os-specific/linux/untie/default.nix
@@ -1,46 +1,24 @@
-x@{builderDefsPackage
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="untie";
-    version="0.3";
-    name="${baseName}-${version}";
-    url="http://guichaz.free.fr/${baseName}/files/${name}.tar.bz2";
-    hash="154c3550af3d3513022a15381bbc2693f5dd7789bf0a4320635991b8f6b3648c";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "untie-${version}";
+  version = "0.3";
+  src = fetchurl {
+    url = "http://guichaz.free.fr/untie/files/${name}.tar.bz2";
+    sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  makeFlags = "PREFIX=$(out)";
 
-  phaseNames = ["doMakeInstall"];
-  makeFlags=["PREFIX=$out"];
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool to run processes untied from some of the namespaces";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; linux;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://guichaz.free.fr/untie";
     };
   };
-}) x
-
+}
-- 
cgit 1.4.1