From 1b2aec580b47a7467864a2813ee8d676d957a4bf Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 21 May 2020 23:45:02 +0530
Subject: [PATCH] ports: check and don't fixup

Shebangs change with the interpreters.
---
 flake.nix                       |  5 +++++
 packages/genodelabs/default.nix |  1 +
 packages/genodelabs/ports.nix   | 26 +++++++++++++-------------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index c84059e..1e26683 100644
--- a/flake.nix
+++ b/flake.nix
@@ -134,6 +134,11 @@
             nixpkgs = nixpkgsFor.${system};
             legacyPackages = self.legacyPackages.${system};
           } // {
+            ports = nixpkgsFor.${localSystem}.symlinkJoin {
+              name = "ports";
+              paths = (builtins.attrValues
+                self.packages.${system}.genodeSources.ports);
+            };
             nixosGuest = let
               nixos = nixpkgs.lib.nixosSystem {
                 system = localSystem;
diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix
index d8efec6..d26599d 100644
--- a/packages/genodelabs/default.nix
+++ b/packages/genodelabs/default.nix
@@ -103,6 +103,7 @@ let
           cp -a $CONTRIB_DIR/* $out/
           runHook postInstall
         '';
+      dontFixup = true;
     });
 
   ports = stdenv.lib.mapAttrs preparePort
diff --git a/packages/genodelabs/ports.nix b/packages/genodelabs/ports.nix
index 2bb2722..126451b 100644
--- a/packages/genodelabs/ports.nix
+++ b/packages/genodelabs/ports.nix
@@ -2,43 +2,43 @@
 { buildPackages }:
 with buildPackages; {
   dde_bsd.hash = "sha256-2ilZs6JkcQAvU/sQYnHunGtGRZDt7qLTpKZxQxSOf2I=";
-  dde_ipxe.hash = "sha256-uK110Cr01D6I2Fo0ZNP5U7rheseuH7LsghSPdFaGU3k=";
+  dde_ipxe.hash = "sha256-NJ129+DkxFg1fFHJBABBFRRjqEVNSz6v2hEB80AuEM4=";
   dde_linux.hash = "sha256-3G5Mprv9ZBNhDJRuVF6Nrkp3KbFaN10IKFq0OdyAY9M=";
   dde_rump = {
     hash = "sha256-Wr5otGkWEa+5xImsFHQzwap5LckNEbyWA/7xbNcOreI=";
     nativeBuildInputs = [ subversion ];
     patches = [ ./svn-trust-server-cert.patch ];
   };
-  expat.hash = "sha256-6Kz8qHmSg9/r+o3UJX8ZyB5aDjmfrbsUW/TppbB16jk=";
+  # expat.hash = "sha256-6Kz8qHmSg9/r+o3UJX8ZyB5aDjmfrbsUW/TppbB16jk=";
   jitterentropy.hash = "sha256-6KS732GxtUMz0xPYKtshdn039DgdJq11vTDQesZn4Ds=";
-  jpeg.hash = "sha256-fiRwzwEDVd1Xgd+k4WOez8AfR4brsBg7g0D9+9VJZr4=";
+  jpeg.hash = "sha256-RLVnlrnYGrhqr3Feikoi/BNditCaKN0u3t9/UDpl2wQ=";
   libc = {
     hash = "sha256-RL5l7GHlczc/6Uils9WCuPh9cCawx6XZ4H0HLPdMmAA=";
     nativeBuildInputs = [ buildPackages.gcc subversion ];
   };
-  libiconv.hash = "sha256-H1BPWDmQ4s0zLnCitg+kz2yNeTU7+S7/w58SqmvHWGQ=";
-  libpng.hash = "sha256-N69Q7ciQuW4sFl5k5XIe7rdkQvYZ3qfo6FlvgDgDGJo=";
+  libiconv.hash = "sha256-25YcW5zo1fE33ZolGQroR+KZO8wHEdN1QXa7+MhwS78=";
+  libpng.hash = "sha256-hNmSWN4gEk4UIjzkGD4j5qFooMCVXLwcBeOeFumvh+4=";
   libssh.hash = "sha256-Z/1YdhISh2kqBjWiTOLkS+usoeeekJvAuYrVUgpxnQM=";
-  lighttpd.hash = "sha256-fJ5w2YhTwjK+z6+VK50InPnDM5AmMnAwh0imx04sr5E=";
+  lighttpd.hash = "sha256-kEP4Q7rBhN9D77008pkOlnj7sWhk1gbiokzOGGDs2PM=";
   lwip.hash = "sha256-mB7RI9ITvS5IDawQS4pXBcDQDQhtXEk3w0Deis+SzLQ=";
-  lz4.hash = "sha256-IFfj+D5l+BE6JnuN0+doIAvTzXz5SHCQ+EF2m75UK08=";
+  lz4.hash = "sha256-nydkAbexaqcKYDzp0TsECKMXyPaoY9rf3MAbU33VPrg=";
   mesa = {
-    hash = "sha256-szIyFAIkL14xBMdszkox00y2uwGwjHDUyQ+5bhljiJ8=";
+    hash = "sha256-5SHU4m3kMmi6Nfj4SBq2tO3mzsIBrRPz64dexjV4pYA=";
     nativeBuildInputs = [ python ];
   };
-  mupdf.hash = "sha256-+Q4IwYGLynoud2IEsKGfZQjpPRV6wFv5iI/ReAKBZcM=";
+  mupdf.hash = "sha256-6NX7zvOwReBBdz83RxGW2FJWUkqI/DTBkSOCqukidYs=";
   openssl = {
-    hash = "sha256-F0olTWYUwD//eJZ14ibN/IvbFXw3WQUZ/6cPI3lsxZI=";
+    hash = "sha256-kLxxl9CNGz8QoXjvYqoEeDeBkp33qElK9HodQJhdAP8=";
     patches = [ ./openssl.patch ];
   };
   qemu-usb.hash = "sha256-F4ZXeH5sx3FOcD42zFOxKFMsqGookKdav1NJ7YgVw98=";
   stb.hash = "sha256-9LSH1i8jcEvjRAmTvgtK+Axy9hO7uiSzmSgBvs0zkTc=";
-  stdcxx.hash = "sha256-U5/+yUBXQ+rKmy6hP7OomIU4g2KvSn2qTltQFzNz9Wo=";
+  stdcxx.hash = "sha256-iiE009fL1yE3XJ7HkaJakOiS++m7qONwwGrdJjBXQ7k=";
   virtualbox5 = {
-    hash = "sha256-2QJMXsr5P+Uu/xz6M+F93JxBznVdE7ZsoZKC2o/Xycw=";
+    hash = "sha256-qTdaJX8plHJV9z5MN68gFwGNhcGFu3f2WwkVkBGu/ck=";
     nativeBuildInputs = [ iasl libxslt unzip yasm ];
     patches = [ ./vbox5-iasl.patch ];
   };
   x86emu.hash = "sha256-QY6OL+cDVjQ67JItP1rS4ufPRGZf43AZtWxwza/0q0w=";
-  zlib.hash = "sha256-+jl8Q3b+fw6P3aNDfLi8lohBJNaoapEld5BcE0GGTWg=";
+  zlib.hash = "sha256-j3JXN0f8thrPCvLhYHIPjbGa0t3iynQ/gO7KMlgljq0=";
 }