diff options
| author | Wong Hoi Sing Edison <hswong3i@pantarei-design.com> | 2021-04-02 11:51:30 +0800 |
|---|---|---|
| committer | Wong Hoi Sing Edison <hswong3i@pantarei-design.com> | 2021-04-06 21:52:00 +0800 |
| commit | 6d984739458511f444e80f06f6a12dd400268372 (patch) | |
| tree | 85a0026235fa43669cb05bd683de08ad57960a61 /nix/default.nix | |
| parent | f143de9db6861cd8b8d6fc4e03f2826041307982 (diff) | |
| download | podman-6d984739458511f444e80f06f6a12dd400268372.tar.gz podman-6d984739458511f444e80f06f6a12dd400268372.tar.bz2 podman-6d984739458511f444e80f06f6a12dd400268372.zip | |
[NO TESTS NEEDED] Update nix pin with `make nixpkgs`
- Bugfix `make nixpkgs` which pin with branch `nixos-20.09`
- Code lint with `nixpkgs-fmt`
- Code sync between x86\_64 and aarch64
Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
Diffstat (limited to 'nix/default.nix')
| -rw-r--r-- | nix/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/nix/default.nix b/nix/default.nix index 7745d8b50..aae520c9e 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -7,7 +7,7 @@ let libassuan = (static pkg.libassuan); libgpgerror = (static pkg.libgpgerror); libseccomp = (static pkg.libseccomp); - glib = (static pkg.glib).overrideAttrs(x: { + glib = (static pkg.glib).overrideAttrs (x: { outputs = [ "bin" "out" "dev" ]; mesonFlags = [ "-Ddefault_library=static" @@ -15,14 +15,21 @@ let "-Dgtk_doc=false" "-Dnls=disabled" ]; + postInstall = '' + moveToOutput "share/glib-2.0" "$dev" + substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" + sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" + sed '1i#line 1 "${x.pname}-${x.version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ + -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c + ''; }); }; }; }); - static = pkg: pkg.overrideAttrs(x: { + static = pkg: pkg.overrideAttrs (x: { doCheck = false; - configureFlags = (x.configureFlags or []) ++ [ + configureFlags = (x.configureFlags or [ ]) ++ [ "--without-shared" "--disable-shared" ]; @@ -56,4 +63,5 @@ let install -Dm755 bin/podman-remote $out/bin/podman-remote ''; }; -in self +in +self |