diff options
author | Marek Mahut <marek.mahut@gmail.com> | 2020-01-31 08:27:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-31 08:27:54 +0100 |
commit | 688c0471b5c6c4f1bfd9bf48b24209734d4b06d0 (patch) | |
tree | 1bbe5fb1d3b924a59ac05f37007d42f6e2a0f0e0 | |
parent | 645ea323d71ad3ebc3524da3519ba6696685b126 (diff) | |
parent | e9f50d20acec191b2a96b22386e4ad3cc3ded703 (diff) | |
download | nixlib-688c0471b5c6c4f1bfd9bf48b24209734d4b06d0.tar nixlib-688c0471b5c6c4f1bfd9bf48b24209734d4b06d0.tar.gz nixlib-688c0471b5c6c4f1bfd9bf48b24209734d4b06d0.tar.bz2 nixlib-688c0471b5c6c4f1bfd9bf48b24209734d4b06d0.tar.lz nixlib-688c0471b5c6c4f1bfd9bf48b24209734d4b06d0.tar.xz nixlib-688c0471b5c6c4f1bfd9bf48b24209734d4b06d0.tar.zst nixlib-688c0471b5c6c4f1bfd9bf48b24209734d4b06d0.zip |
Merge pull request #78853 from mmahut/fixdat
dat: remove and link to nodePackages.dat
-rw-r--r-- | pkgs/applications/networking/dat/default.nix | 92 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 1 insertions, 93 deletions
diff --git a/pkgs/applications/networking/dat/default.nix b/pkgs/applications/networking/dat/default.nix deleted file mode 100644 index 2e0f8005bdbd..000000000000 --- a/pkgs/applications/networking/dat/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv -, fetchurl -, unzip -}: - -stdenv.mkDerivation rec { - pname = "dat"; - version = "13.13.1"; - - suffix = { - x86_64-darwin = "macos-x64"; - x86_64-linux = "linux-x64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://github.com/datproject/dat/releases/download/v${version}/${pname}-${version}-${suffix}.zip"; - sha256 = { - x86_64-darwin = "1qj38zn33hhr2v39jw14k2af091bafh5yvhs91h5dnjb2r8yxnaq"; - x86_64-linux = "0vgn57kf3j1pbfxlhj4sl1sm2gfd2gcvhk4wz5yf5mzq1vj9ivpv"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - buildInputs = [ unzip ]; - - dontConfigure = true; - dontBuild = true; - dontStrip = true; - dontPatchELF = true; - - installPhase = '' - mkdir -p $out/bin - mv dat $out/bin - ''; - - # dat is a node program packaged using zeit/pkg. - # thus, it contains hardcoded offsets. - # patchelf shifts these locations when it expands headers. - - # this could probably be generalised into allowing any program packaged - # with zeit/pkg to be run on nixos. - - preFixup = let - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc]; - in stdenv.lib.optionalString (!stdenv.isDarwin) '' - orig_size=$(stat --printf=%s $out/bin/dat) - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/dat - patchelf --set-rpath ${libPath} $out/bin/dat - chmod +x $out/bin/dat - - new_size=$(stat --printf=%s $out/bin/dat) - - ###### zeit-pkg fixing starts here. - # we're replacing plaintext js code that looks like - # PAYLOAD_POSITION = '1234 ' | 0 - # [...] - # PRELUDE_POSITION = '1234 ' | 0 - # ^-----20-chars-----^^------22-chars------^ - # ^-- grep points here - # - # var_* are as described above - # shift_by seems to be safe so long as all patchelf adjustments occur - # before any locations pointed to by hardcoded offsets - - var_skip=20 - var_select=22 - shift_by=$(expr $new_size - $orig_size) - - function fix_offset { - # $1 = name of variable to adjust - location=$(grep -obUam1 "$1" $out/bin/dat | cut -d: -f1) - location=$(expr $location + $var_skip) - - value=$(dd if=$out/bin/dat iflag=count_bytes,skip_bytes skip=$location \ - bs=1 count=$var_select status=none) - value=$(expr $shift_by + $value) - - echo -n $value | dd of=$out/bin/dat bs=1 seek=$location conv=notrunc - } - - fix_offset PAYLOAD_POSITION - fix_offset PRELUDE_POSITION - ''; - - meta = with stdenv.lib; { - description = "Peer-to-peer sharing and live synchronization of files"; - homepage = "https://dat.foundation/"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ prusnak ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d44f8348c5e..6bfeaf0acf20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25917,5 +25917,5 @@ in quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; - dat = callPackage ../applications/networking/dat { }; + dat = nodePackages.dat; } |