Merge pull request #362 from fzakaria/faridzakaria/musl-flake

Add support to build with musl

2 files changed, 27 insertions, 4 deletions

diff --git a/README.md b/README.md
index 18a72ee..9db921a 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,7 @@ libraries.  In particular, it can do the following:
 
 ## Compiling and Testing
 
+### Via Autotools
 ```console
 ./bootstrap.sh
 ./configure
@@ -77,6 +78,13 @@ make
 make check
 sudo make install
 ```
+### Via Nix
+
+You can build with Nix in several ways.
+
+1. Building via `nix build` will produce the result in `./result/bin/patchelf`. If you would like to build _patchelf_ with _musl_ try `nix build .#patchelf-musl`
+
+2. You can launch a development environment with `nix develop` and folllow the autotools steps above. If you would like to develop with _musl_ try `nix develop .#musl`
 
 ## Author
 
diff --git a/flake.nix b/flake.nix
index 045b6d7..8c3988c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,10 @@
 
     {
       overlay = final: prev: {
+        patchelf-new-musl = final.pkgsMusl.callPackage ./patchelf.nix {
+          inherit version;
+          src = self;
+        };
         patchelf-new = final.callPackage ./patchelf.nix {
           inherit version;
           src = self;
@@ -85,12 +89,23 @@
         build = self.hydraJobs.build.${system};
       });
 
+      devShell = forAllSystems (system: self.devShells.${system}.glibc);
+
+      devShells = forAllSystems (system:
+        {
+          glibc = self.packages.${system}.patchelf;
+          musl = self.packages.${system}.patchelf-musl;
+        });
+
       defaultPackage = forAllSystems (system:
-        (import nixpkgs {
-          inherit system;
-          overlays = [ self.overlay ];
-        }).patchelf-new
+        self.packages.${system}.patchelf
       );
 
+      packages = forAllSystems (system:
+        {
+          patchelf = nixpkgsFor.${system}.patchelf-new;
+          patchelf-musl = nixpkgsFor.${system}.patchelf-new-musl;
+        });
+
     };
 }