From 3017d813df94ec30537eca48ef57f33dcf07b207 Mon Sep 17 00:00:00 2001 From: Jean-Marie Gaillourdet Date: Sun, 19 Jan 2020 19:02:55 +0100 Subject: [PATCH 1/3] scala_2_11: move text files from $out to appropriate subdirs Before, this package installed files called LICENSE and NOTICE at the profile root directory. Which conflicts with other packages with the same issue. Those files reside now in $out/share/doc/scala/. --- pkgs/development/compilers/scala/2.11.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index a1f803b6719..db1a8f4edca 100644 --- a/pkgs/development/compilers/scala/2.11.nix +++ b/pkgs/development/compilers/scala/2.11.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { rm "bin/"*.bat mv * $out + # put docs in correct subdirectory + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/${name} + mv $out/man $out/share/man + for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ --prefix PATH ":" ${coreutils}/bin \ From 8b7c59bab0e99f7aa00c44cd18f44badbe4f8a2e Mon Sep 17 00:00:00 2001 From: Jean-Marie Gaillourdet Date: Sun, 19 Jan 2020 19:12:42 +0100 Subject: [PATCH 2/3] scala_2_12: move text files from $out to appropriate subdirs Before, this package installed files called LICENSE and NOTICE at the profile root directory. Which conflicts with other packages with the same issue. Those files reside now in $out/share/doc/scala/. --- pkgs/development/compilers/scala/2.12.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix index 9e11daced4a..3f61669b938 100644 --- a/pkgs/development/compilers/scala/2.12.nix +++ b/pkgs/development/compilers/scala/2.12.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { # put docs in correct subdirectory mkdir -p $out/share/doc mv $out/doc $out/share/doc/scala + mv $out/{LICENSE,NOTICE} $out/share/doc/scala for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ From 254045fde6d08424adf52cfb39268b3b7bc3b5c2 Mon Sep 17 00:00:00 2001 From: Jean-Marie Gaillourdet Date: Sun, 19 Jan 2020 19:13:06 +0100 Subject: [PATCH 3/3] scala: move text files from $out to appropriate subdirs Before, this package installed files called LICENSE and NOTICE at the profile root directory. Which conflicts with other packages with the same issue. Those files reside now in $out/share/doc/scala/. --- pkgs/development/compilers/scala/2.13.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix index 6bba11af9d4..b140d4e2a2d 100644 --- a/pkgs/development/compilers/scala/2.13.nix +++ b/pkgs/development/compilers/scala/2.13.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { # put docs in correct subdirectory mkdir -p $out/share/doc mv $out/doc $out/share/doc/scala + mv $out/{LICENSE,NOTICE} $out/share/doc/scala for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \