about summary refs log tree commit diff
path: root/nix/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'nix/pkgs')
-rw-r--r--nix/pkgs/aarch64-darwin.nix5
-rw-r--r--nix/pkgs/glibc-all-in-one/default.nix15
-rw-r--r--nix/pkgs/libc-database/default.nix2
-rw-r--r--nix/pkgs/x86_64-linux.nix1
4 files changed, 18 insertions, 5 deletions
diff --git a/nix/pkgs/aarch64-darwin.nix b/nix/pkgs/aarch64-darwin.nix
index f5e8b60..78d5374 100644
--- a/nix/pkgs/aarch64-darwin.nix
+++ b/nix/pkgs/aarch64-darwin.nix
@@ -1,6 +1,7 @@
 final: prev: {
   vokobe = final.callPackage ./vokobe { inherit (final) naersk; };
   r2wars-web = final.callPackage ./r2wars-web { };
-  remarvin = final.callPackage ./remarvin { };
-  libc-database = final.callPackage ./libc-database {};
+  # remarvin = final.callPackage ./remarvin { };
+  # libc-database = final.callPackage ./libc-database {};
+  # glibc-all-in-one = final.callPackage ./glibc-all-in-one { };
 }
diff --git a/nix/pkgs/glibc-all-in-one/default.nix b/nix/pkgs/glibc-all-in-one/default.nix
index bbb0824..896f91e 100644
--- a/nix/pkgs/glibc-all-in-one/default.nix
+++ b/nix/pkgs/glibc-all-in-one/default.nix
@@ -1,6 +1,8 @@
 { pkgs ? import <nixpkgs> {}, lib, fetchFromGitHub }:
 
-pkgs.stdenv.mkDerivation rec {
+let
+  python = pkgs.python311.withPackages ( ps: with ps; [ requests ] );
+in pkgs.stdenv.mkDerivation rec {
   name = "glibc-all-in-one";
   version = "master";
 
@@ -8,12 +10,21 @@ pkgs.stdenv.mkDerivation rec {
     owner = "fr0ster";
     repo = "glibc-all-in-one";
     rev = version;
-    sha256 = "Zysjhr76TenMarnoKo+M8DrTNbsnaXSoFZO1puPVoxU=";
+    sha256 = "sha256-vrh/ol56sNWTjGbwZ1Jrh+Lxz7aROvI6IbkJf/WliNE=";
   };
 
   buildPhase = '''';
 
   installPhase = ''
+    mkdir -p $out/bin
+    cp build download extract $out/bin
+    cp update_list $out/bin/update_list_raw
+
+    echo "${python}/bin/python3 $out/bin/update_list_raw" > $out/bin/update_list
+    chmod +x $out/bin/update_list
+
+    mkdir -p $out/debs
+    mkdir -p $out/libs
   '';
 
   meta = {
diff --git a/nix/pkgs/libc-database/default.nix b/nix/pkgs/libc-database/default.nix
index b13a167..0bc91b4 100644
--- a/nix/pkgs/libc-database/default.nix
+++ b/nix/pkgs/libc-database/default.nix
@@ -13,7 +13,7 @@ pkgs.stdenv.mkDerivation rec {
     owner = "niklasb";
     repo = "libc-database";
     rev = version;
-    sha256 = "Zysjhr76TenMarnoKo+M8DrTNbsnaXSoFZO1puPVoxU=";
+    sha256 = "sha256-Zysjhr76TenMarnoKo+M8DrTNbsnaXSoFZO1puPVoxU=";
   };
 
   # not building, we just want to download the repo
diff --git a/nix/pkgs/x86_64-linux.nix b/nix/pkgs/x86_64-linux.nix
index c186cc4..33f314b 100644
--- a/nix/pkgs/x86_64-linux.nix
+++ b/nix/pkgs/x86_64-linux.nix
@@ -2,5 +2,6 @@ final: prev: {
   vokobe = final.callPackage ./vokobe { inherit (final) naersk; };
   r2wars-web = final.callPackage ./r2wars-web { };
   remarvin = final.callPackage ./remarvin { };
+  # glibc-all-in-one = final.callPackage ./glibc-all-in-one { };
   # libc-database = final.callPackage ./libc-database {};
 }