diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-12 11:37:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-12 11:37:22 +0100 |
commit | cfb198015e5d7bac76f0737b5997fa37e88acc6f (patch) | |
tree | 00c95b0ed837d459fa272f7742b6ec8479234eb6 /pkgs/desktops | |
parent | 2d77958271ad6beeeb082635eb3e1cb508189d8d (diff) | |
parent | d627ded4614b58028f70357cf387f983cc3d8e67 (diff) | |
download | nixlib-cfb198015e5d7bac76f0737b5997fa37e88acc6f.tar nixlib-cfb198015e5d7bac76f0737b5997fa37e88acc6f.tar.gz nixlib-cfb198015e5d7bac76f0737b5997fa37e88acc6f.tar.bz2 nixlib-cfb198015e5d7bac76f0737b5997fa37e88acc6f.tar.lz nixlib-cfb198015e5d7bac76f0737b5997fa37e88acc6f.tar.xz nixlib-cfb198015e5d7bac76f0737b5997fa37e88acc6f.tar.zst nixlib-cfb198015e5d7bac76f0737b5997fa37e88acc6f.zip |
Merge pull request #29012 from gnidorah/maxx
maxx: allow launching individual components
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/maxx/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix index 891d644071c1..4a404b89ff6d 100644 --- a/pkgs/desktops/maxx/default.nix +++ b/pkgs/desktops/maxx/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation { installPhase = '' maxx=$out/opt/MaXX - mkdir -p "$maxx" $out/share + mkdir -p "$maxx" $out/share $maxx/sbin mv -- ./* "$maxx" ln -s $maxx/share/icons $out/share @@ -60,17 +60,18 @@ in stdenv.mkDerivation { while IFS= read -r -d ''$'\0' i; do if isELF "$i"; then bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?` - patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i" + patchelf --set-rpath "$maxx/lib64:$maxx/OpenMotif-2.1.32/lib64:$maxx/OpenMotif-2.3.1/lib64:${stdenv.lib.makeLibraryPath deps}" "$i" if [ "$bin" -eq 0 ]; then wrapProgram "$i" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set NIX_REDIRECTS /opt/MaXX=$maxx + --set NIX_REDIRECTS /opt/MaXX=$maxx \ + --prefix PATH : $maxx/sbin fi fi done < <(find "$maxx" -type f -print0) - cp ${gcc-unwrapped}/bin/cpp ${gcc-unwrapped}/libexec/gcc/*/*/cc1 $maxx/bin - for i in $maxx/bin/cpp $maxx/bin/cc1 + cp ${gcc-unwrapped}/bin/cpp ${gcc-unwrapped}/libexec/gcc/*/*/cc1 $maxx/sbin + for i in $maxx/sbin/cpp $maxx/sbin/cc1 do wrapProgram "$i" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ @@ -88,7 +89,6 @@ in stdenv.mkDerivation { }; maintainers = [ maintainers.gnidorah ]; platforms = ["x86_64-linux"]; - hydraPlatforms = []; longDescription = '' A clone of IRIX Interactive Desktop made in agreement with SGI. Provides simple and fast retro desktop environment. |