diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-01-24 11:53:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 11:53:50 +0000 |
| commit | e0137930f2c4e0500ad0e5cf88be64a97c4a7479 (patch) | |
| tree | 3a26424712367e63a0370da4f268727c6befccb1 /pkgs/development | |
| parent | 3c62a8225903c35a79414be1ccae8ab5c90753a1 (diff) | |
| parent | 254045fde6d08424adf52cfb39268b3b7bc3b5c2 (diff) | |
| download | nixpkgs-e0137930f2c4e0500ad0e5cf88be64a97c4a7479.tar nixpkgs-e0137930f2c4e0500ad0e5cf88be64a97c4a7479.tar.gz nixpkgs-e0137930f2c4e0500ad0e5cf88be64a97c4a7479.tar.bz2 nixpkgs-e0137930f2c4e0500ad0e5cf88be64a97c4a7479.tar.lz nixpkgs-e0137930f2c4e0500ad0e5cf88be64a97c4a7479.tar.xz nixpkgs-e0137930f2c4e0500ad0e5cf88be64a97c4a7479.tar.zst nixpkgs-e0137930f2c4e0500ad0e5cf88be64a97c4a7479.zip | |
Pr scala out dir cleaned (#78042)
Pr scala out dir cleaned
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/scala/2.11.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/scala/2.12.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/scala/2.13.nix | 1 |
3 files changed, 7 insertions, 0 deletions
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 \ 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 \ 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 \ |