From 18fc13d143f6d2509f9749b429cbfd618d71dad0 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 14 Apr 2020 01:12:22 +0530 Subject: [PATCH] Flatten output hierarchy The output subdirectories and package manifest were not in use. --- flake.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 8783e4e..74bed25 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,6 @@ value = localPackages.stdenvNoCC.mkDerivation { pname = name; inherit (value) version; - outputs = [ "out" "manifest" ]; preferLocalBuild = true; src = localPackages.fetchurl { url = "${baseUrl}${name}/${value.version}.tar.xz"; @@ -24,18 +23,8 @@ dontBuild = true; installPhase = '' find . -type f | while read FILE; do - case $FILE in - *.a | *.o) install -Dm444 -t $out/lib $FILE;; - *.so) install -Dm555 -t $out/lib $FILE;; - *.tar) install -Dm444 -t $out/tar $FILE;; - *) install -Dm555 -t $out/bin $FILE;; - esac + install -Dm444 -t $out $FILE done - - local drv=$out - echo -n '[' >> $manifest - find $out/ -type f -printf ',{mapKey= "%f",mapValue="%p"}' >> $manifest - echo -n ']' >> $manifest ''; meta = { license = [ "LicenseRef-Genode" ];