ref: change the way tl libs are bundled

Dich0tomy · May 23, 2024 · 9673ce0 · 9673ce0
1 parent 89ab28c
commit 9673ce0
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 23 deletions.
diff --git a/nix/dependencies/default.nix b/nix/dependencies/default.nix
@@ -1,4 +1,4 @@
 {pkgs}: {
-  tl-optional = pkgs.callPackage ./tl-optional {version = "1.1.0";};
-  tl-expected = pkgs.callPackage ./tl-expected {version = "1.1.0";};
+  tl-optional = pkgs.callPackage ./tl-optional {};
+  tl-expected = pkgs.callPackage ./tl-expected {};
 }
diff --git a/nix/dependencies/tl-expected/default.nix b/nix/dependencies/tl-expected/default.nix
@@ -1,23 +1,30 @@
 {
-  pkgs,
-  version,
+  stdenv,
+  cmake,
+  fetchFromGitHub
 }:
-pkgs.stdenv.mkDerivation {
+stdenv.mkDerivation (self: {
   pname = "expected";
-  inherit version;
+  version = "1.1.0";
 
-  src = pkgs.fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "TartanLlama";
     repo = "expected";
-    rev = "v${version}";
+    rev = "v${self.version}";
     sha256 = "sha256-AuRU8VI5l7Th9fJ5jIc/6mPm0Vqbbt6rY8QCCNDOU50=";
   };
 
-  nativeBuildInputs = [pkgs.cmake];
+	strictDeps = true;
 
-  strictDeps = true;
+  nativeBuildInputs = [cmake];
 
   postInstall = ''
-    install -Dm644 ${./expected.pc} $out/lib/pkgconfig/expected.pc
+		mkdir -p $out/lib/pkgconfig
+
+    substitute \
+    	${./expected.pc} \
+    	$out/lib/pkgconfig/expected.pc \
+    	--subst-var out \
+    	--subst-var version
   '';
-}
+ })
diff --git a/nix/dependencies/tl-expected/expected.pc b/nix/dependencies/tl-expected/expected.pc
@@ -3,5 +3,5 @@ includedir=${prefix}/include
 
 Name: expected
 Description: TartanLlama's expected
-Version: 1.1.0
+Version: @version@
 Cflags: -I${includedir}/
diff --git a/nix/dependencies/tl-optional/default.nix b/nix/dependencies/tl-optional/default.nix
@@ -1,23 +1,30 @@
 {
-  pkgs,
-  version,
+  stdenv,
+  cmake,
+  fetchFromGitHub
 }:
-pkgs.stdenv.mkDerivation {
+stdenv.mkDerivation (self: {
   pname = "optional";
-  inherit version;
+	version = "1.1.0";
 
-  src = pkgs.fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "TartanLlama";
     repo = "optional";
-    rev = "v${version}";
+    rev = "v${self.version}";
     sha256 = "sha256-WPTXTQmzJjAIJI1zM6svZZTO8gP/jt5xDHHRCCu9cmI=";
   };
 
   strictDeps = true;
 
-  nativeBuildInputs = [pkgs.cmake];
+  nativeBuildInputs = [cmake];
 
   postInstall = ''
-    install -Dm644 ${./optional.pc} $out/lib/pkgconfig/optional.pc
+		mkdir -p $out/lib/pkgconfig
+
+		substitute \
+			${./optional.pc} \
+			$out/lib/pkgconfig/optional.pc \
+			--subst-var out \
+			--subst-var version
   '';
-}
+})
diff --git a/nix/dependencies/tl-optional/optional.pc b/nix/dependencies/tl-optional/optional.pc
@@ -3,5 +3,5 @@ includedir=${prefix}/include
 
 Name: optional
 Description: TartanLlama's optional
-Version: 1.1.0
+Version: @version@
 Cflags: -I${includedir}/